You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2012/12/06 22:58:13 UTC

svn commit: r1418104 [19/23] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomcat6/ apidocs/org/apache/tomcat/maven/plugin/tomcat6/c...

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html?rev=1418104&r1=1418103&r2=1418104&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html Thu Dec  6 21:57:40 2012
@@ -79,45 +79,45 @@
 <a class="jxr_linenumber" name="69" href="#69">69</a>      <strong class="jxr_keyword">extends</strong> AbstractTomcat7Mojo
 <a class="jxr_linenumber" name="70" href="#70">70</a>  {
 <a class="jxr_linenumber" name="71" href="#71">71</a>  
-<a class="jxr_linenumber" name="72" href="#72">72</a>      @Parameter (defaultValue = <span class="jxr_string">"${project.artifact}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="73" href="#73">73</a>      <strong class="jxr_keyword">private</strong> Artifact projectArtifact;
+<a class="jxr_linenumber" name="72" href="#72">72</a>      @Parameter( defaultValue = <span class="jxr_string">"${project.artifact}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="73" href="#73">73</a>      <strong class="jxr_keyword">protected</strong> Artifact projectArtifact;
 <a class="jxr_linenumber" name="74" href="#74">74</a>  
 <a class="jxr_linenumber" name="75" href="#75">75</a>      <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="76" href="#76">76</a>  <em class="jxr_javadoccomment">     * The maven project.</em>
 <a class="jxr_linenumber" name="77" href="#77">77</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="78" href="#78">78</a>      @Parameter (defaultValue = <span class="jxr_string">"${project}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="78" href="#78">78</a>      @Parameter( defaultValue = <span class="jxr_string">"${project}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong> )
 <a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">protected</strong> MavenProject project;
 <a class="jxr_linenumber" name="80" href="#80">80</a>  
-<a class="jxr_linenumber" name="81" href="#81">81</a>      @Parameter (defaultValue = <span class="jxr_string">"${plugin.artifacts}"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="82" href="#82">82</a>      <strong class="jxr_keyword">private</strong> List&lt;Artifact&gt; pluginArtifacts;
+<a class="jxr_linenumber" name="81" href="#81">81</a>      @Parameter( defaultValue = <span class="jxr_string">"${plugin.artifacts}"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="82" href="#82">82</a>      <strong class="jxr_keyword">protected</strong> List&lt;Artifact&gt; pluginArtifacts;
 <a class="jxr_linenumber" name="83" href="#83">83</a>  
-<a class="jxr_linenumber" name="84" href="#84">84</a>      @Parameter (defaultValue = <span class="jxr_string">"${project.build.directory}"</span>)
-<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">private</strong> File buildDirectory;
+<a class="jxr_linenumber" name="84" href="#84">84</a>      @Parameter( defaultValue = <span class="jxr_string">"${project.build.directory}"</span> )
+<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">protected</strong> File buildDirectory;
 <a class="jxr_linenumber" name="86" href="#86">86</a>  
 <a class="jxr_linenumber" name="87" href="#87">87</a>      <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="88" href="#88">88</a>  <em class="jxr_javadoccomment">     * Path under {@link #buildDirectory} where this mojo may do temporary work.</em>
 <a class="jxr_linenumber" name="89" href="#89">89</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a>      @Parameter (defaultValue = <span class="jxr_string">"${project.build.directory}/tomcat7-maven-plugin-exec"</span>)
+<a class="jxr_linenumber" name="90" href="#90">90</a>      @Parameter( defaultValue = <span class="jxr_string">"${project.build.directory}/tomcat7-maven-plugin-exec"</span> )
 <a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">private</strong> File pluginWorkDirectory;
 <a class="jxr_linenumber" name="92" href="#92">92</a>  
-<a class="jxr_linenumber" name="93" href="#93">93</a>      @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.tomcatConf"</span>, defaultValue = <span class="jxr_string">"src/main/tomcatconf"</span>)
-<a class="jxr_linenumber" name="94" href="#94">94</a>      <strong class="jxr_keyword">private</strong> File tomcatConfigurationFilesDirectory;
+<a class="jxr_linenumber" name="93" href="#93">93</a>      @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.tomcatConf"</span>, defaultValue = <span class="jxr_string">"src/main/tomcatconf"</span> )
+<a class="jxr_linenumber" name="94" href="#94">94</a>      <strong class="jxr_keyword">protected</strong> File tomcatConfigurationFilesDirectory;
 <a class="jxr_linenumber" name="95" href="#95">95</a>  
-<a class="jxr_linenumber" name="96" href="#96">96</a>      @Parameter (defaultValue = <span class="jxr_string">"src/main/tomcatconf/server.xml"</span>, property = <span class="jxr_string">"maven.tomcat.exec.war.serverXml"</span>)
-<a class="jxr_linenumber" name="97" href="#97">97</a>      <strong class="jxr_keyword">private</strong> File serverXml;
+<a class="jxr_linenumber" name="96" href="#96">96</a>      @Parameter( defaultValue = <span class="jxr_string">"src/main/tomcatconf/server.xml"</span>, property = <span class="jxr_string">"maven.tomcat.exec.war.serverXml"</span> )
+<a class="jxr_linenumber" name="97" href="#97">97</a>      <strong class="jxr_keyword">protected</strong> File serverXml;
 <a class="jxr_linenumber" name="98" href="#98">98</a>  
 <a class="jxr_linenumber" name="99" href="#99">99</a>      <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment">     * Name of the generated exec JAR.</em>
 <a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="102" href="#102">102</a>     @Parameter (property = <span class="jxr_string">"tomcat.jar.finalName"</span>,
-<a class="jxr_linenumber" name="103" href="#103">103</a>                 defaultValue = <span class="jxr_string">"${project.artifactId}-${project.version}-war-exec.jar"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="104" href="#104">104</a>     <strong class="jxr_keyword">private</strong> String finalName;
+<a class="jxr_linenumber" name="102" href="#102">102</a>     @Parameter( property = <span class="jxr_string">"tomcat.jar.finalName"</span>,
+<a class="jxr_linenumber" name="103" href="#103">103</a>                 defaultValue = <span class="jxr_string">"${project.artifactId}-${project.version}-war-exec.jar"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="104" href="#104">104</a>     <strong class="jxr_keyword">protected</strong> String finalName;
 <a class="jxr_linenumber" name="105" href="#105">105</a> 
 <a class="jxr_linenumber" name="106" href="#106">106</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment">     * The webapp context path to use for the web application being run.</em>
 <a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">     * The name to store webapp in exec jar. Do not use /</em>
 <a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.path"</span>, defaultValue = <span class="jxr_string">"${project.artifactId}"</span>, required = <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="110" href="#110">110</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.path"</span>, defaultValue = <span class="jxr_string">"${project.artifactId}"</span>, required = <strong class="jxr_keyword">true</strong> )
 <a class="jxr_linenumber" name="111" href="#111">111</a>     <strong class="jxr_keyword">protected</strong> String path;
 <a class="jxr_linenumber" name="112" href="#112">112</a> 
 <a class="jxr_linenumber" name="113" href="#113">113</a>     @Parameter
@@ -130,82 +130,82 @@
 <a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_javadoccomment">     * Maven Artifact Factory component.</em>
 <a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_javadoccomment">     */</em>
 <a class="jxr_linenumber" name="122" href="#122">122</a>     @Component
-<a class="jxr_linenumber" name="123" href="#123">123</a>     <strong class="jxr_keyword">private</strong> ArtifactFactory artifactFactory;
+<a class="jxr_linenumber" name="123" href="#123">123</a>     <strong class="jxr_keyword">protected</strong> ArtifactFactory artifactFactory;
 <a class="jxr_linenumber" name="124" href="#124">124</a> 
 <a class="jxr_linenumber" name="125" href="#125">125</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_javadoccomment">     * Location of the local repository.</em>
 <a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a>     @Parameter (defaultValue = <span class="jxr_string">"${localRepository}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">private</strong> ArtifactRepository local;
+<a class="jxr_linenumber" name="128" href="#128">128</a>     @Parameter( defaultValue = <span class="jxr_string">"${localRepository}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">protected</strong> ArtifactRepository local;
 <a class="jxr_linenumber" name="130" href="#130">130</a> 
 <a class="jxr_linenumber" name="131" href="#131">131</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment">     * List of Remote Repositories used by the resolver</em>
 <a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a>     @Parameter (defaultValue = <span class="jxr_string">"${project.remoteArtifactRepositories}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="134" href="#134">134</a>     @Parameter( defaultValue = <span class="jxr_string">"${project.remoteArtifactRepositories}"</span>, required = <strong class="jxr_keyword">true</strong>, readonly = <strong class="jxr_keyword">true</strong> )
 <a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">protected</strong> List&lt;ArtifactRepository&gt; remoteRepos;
 <a class="jxr_linenumber" name="136" href="#136">136</a> 
 <a class="jxr_linenumber" name="137" href="#137">137</a>     @Component
-<a class="jxr_linenumber" name="138" href="#138">138</a>     <strong class="jxr_keyword">private</strong> MavenProjectHelper projectHelper;
+<a class="jxr_linenumber" name="138" href="#138">138</a>     <strong class="jxr_keyword">protected</strong> MavenProjectHelper projectHelper;
 <a class="jxr_linenumber" name="139" href="#139">139</a> 
 <a class="jxr_linenumber" name="140" href="#140">140</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment">     * Attach or not the generated artifact to the build (use true if you want to install or deploy it)</em>
 <a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="143" href="#143">143</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifact"</span>, defaultValue = <span class="jxr_string">"true"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="144" href="#144">144</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> attachArtifact;
+<a class="jxr_linenumber" name="143" href="#143">143</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifact"</span>, defaultValue = <span class="jxr_string">"true"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="144" href="#144">144</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> attachArtifact;
 <a class="jxr_linenumber" name="145" href="#145">145</a> 
 <a class="jxr_linenumber" name="146" href="#146">146</a> 
 <a class="jxr_linenumber" name="147" href="#147">147</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment">     * the classifier to use for the attached/generated artifact</em>
 <a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="150" href="#150">150</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifactClassifier"</span>, defaultValue = <span class="jxr_string">"exec-war"</span>,
-<a class="jxr_linenumber" name="151" href="#151">151</a>                 required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="152" href="#152">152</a>     <strong class="jxr_keyword">private</strong> String attachArtifactClassifier;
+<a class="jxr_linenumber" name="150" href="#150">150</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifactClassifier"</span>, defaultValue = <span class="jxr_string">"exec-war"</span>,
+<a class="jxr_linenumber" name="151" href="#151">151</a>                 required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="152" href="#152">152</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifier;
 <a class="jxr_linenumber" name="153" href="#153">153</a> 
 <a class="jxr_linenumber" name="154" href="#154">154</a> 
 <a class="jxr_linenumber" name="155" href="#155">155</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_javadoccomment">     * the type to use for the attached/generated artifact</em>
 <a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="158" href="#158">158</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifactType"</span>, defaultValue = <span class="jxr_string">"jar"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">private</strong> String attachArtifactClassifierType;
+<a class="jxr_linenumber" name="158" href="#158">158</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.attachArtifactType"</span>, defaultValue = <span class="jxr_string">"jar"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifierType;
 <a class="jxr_linenumber" name="160" href="#160">160</a> 
 <a class="jxr_linenumber" name="161" href="#161">161</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_javadoccomment">     * to enable naming when starting tomcat</em>
 <a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="164" href="#164">164</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.enableNaming"</span>, defaultValue = <span class="jxr_string">"false"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="165" href="#165">165</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> enableNaming;
+<a class="jxr_linenumber" name="164" href="#164">164</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.enableNaming"</span>, defaultValue = <span class="jxr_string">"false"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="165" href="#165">165</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> enableNaming;
 <a class="jxr_linenumber" name="166" href="#166">166</a> 
 <a class="jxr_linenumber" name="167" href="#167">167</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_javadoccomment">     * see <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html" target="alexandria_uri">http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html</a></em>
 <a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="170" href="#170">170</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.accessLogValveFormat"</span>, defaultValue = <span class="jxr_string">"%h %l %u %t %r %s %b %I %D"</span>,
-<a class="jxr_linenumber" name="171" href="#171">171</a>                 required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="172" href="#172">172</a>     <strong class="jxr_keyword">private</strong> String accessLogValveFormat;
+<a class="jxr_linenumber" name="170" href="#170">170</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.accessLogValveFormat"</span>, defaultValue = <span class="jxr_string">"%h %l %u %t %r %s %b %I %D"</span>,
+<a class="jxr_linenumber" name="171" href="#171">171</a>                 required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="172" href="#172">172</a>     <strong class="jxr_keyword">protected</strong> String accessLogValveFormat;
 <a class="jxr_linenumber" name="173" href="#173">173</a> 
 <a class="jxr_linenumber" name="174" href="#174">174</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_javadoccomment">     * list of extra dependencies to add in the standalone tomcat jar: your jdbc driver, mail.jar etc..</em>
 <a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_javadoccomment">     * &lt;b&gt;Those dependencies will be in root classloader.&lt;/b&gt;</em>
 <a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_javadoccomment">     */</em>
 <a class="jxr_linenumber" name="178" href="#178">178</a>     @Parameter
-<a class="jxr_linenumber" name="179" href="#179">179</a>     <strong class="jxr_keyword">private</strong> List&lt;ExtraDependency&gt; extraDependencies;
+<a class="jxr_linenumber" name="179" href="#179">179</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraDependency&gt; extraDependencies;
 <a class="jxr_linenumber" name="180" href="#180">180</a> 
 <a class="jxr_linenumber" name="181" href="#181">181</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment">     * list of extra resources to add in the standalone tomcat jar: your logger configuration etc</em>
 <a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_javadoccomment">     */</em>
 <a class="jxr_linenumber" name="184" href="#184">184</a>     @Parameter
-<a class="jxr_linenumber" name="185" href="#185">185</a>     <strong class="jxr_keyword">private</strong> List&lt;ExtraResource&gt; extraResources;
+<a class="jxr_linenumber" name="185" href="#185">185</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraResource&gt; extraResources;
 <a class="jxr_linenumber" name="186" href="#186">186</a> 
 <a class="jxr_linenumber" name="187" href="#187">187</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_javadoccomment">     * Main class to use for starting the standalone jar.</em>
 <a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="190" href="#190">190</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.mainClass"</span>,
-<a class="jxr_linenumber" name="191" href="#191">191</a>                 defaultValue = <span class="jxr_string">"org.apache.tomcat.maven.runner.Tomcat7RunnerCli"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="192" href="#192">192</a>     <strong class="jxr_keyword">private</strong> String mainClass;
+<a class="jxr_linenumber" name="190" href="#190">190</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.mainClass"</span>,
+<a class="jxr_linenumber" name="191" href="#191">191</a>                 defaultValue = <span class="jxr_string">"org.apache.tomcat.maven.runner.Tomcat7RunnerCli"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="192" href="#192">192</a>     <strong class="jxr_keyword">protected</strong> String mainClass;
 <a class="jxr_linenumber" name="193" href="#193">193</a> 
 <a class="jxr_linenumber" name="194" href="#194">194</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_javadoccomment">     * which connector protocol to use HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em>
 <a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a>     @Parameter (property = <span class="jxr_string">"maven.tomcat.exec.war.connectorHttpProtocol"</span>, defaultValue = <span class="jxr_string">"HTTP/1.1"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="198" href="#198">198</a>     <strong class="jxr_keyword">private</strong> String connectorHttpProtocol;
+<a class="jxr_linenumber" name="197" href="#197">197</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.connectorHttpProtocol"</span>, defaultValue = <span class="jxr_string">"HTTP/1.1"</span>, required = <strong class="jxr_keyword">true</strong> )
+<a class="jxr_linenumber" name="198" href="#198">198</a>     <strong class="jxr_keyword">protected</strong> String connectorHttpProtocol;
 <a class="jxr_linenumber" name="199" href="#199">199</a> 
 <a class="jxr_linenumber" name="200" href="#200">200</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> execute()
 <a class="jxr_linenumber" name="201" href="#201">201</a>         <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException
@@ -358,226 +358,225 @@
 <a class="jxr_linenumber" name="348" href="#348">348</a> <em class="jxr_comment">                    || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) )</em>
 <a class="jxr_linenumber" name="349" href="#349">349</a> <em class="jxr_comment">                {</em>
 <a class="jxr_linenumber" name="350" href="#350">350</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( pluginArtifact.getFile() );</em>
-<a class="jxr_linenumber" name="351" href="#351">351</a> <em class="jxr_comment">                    Enumeration&lt;JarEntry&gt; jarEntries = jarFile.entries();</em>
-<a class="jxr_linenumber" name="352" href="#352">352</a> <em class="jxr_comment">                    while ( jarEntries.hasMoreElements() )</em>
-<a class="jxr_linenumber" name="353" href="#353">353</a> <em class="jxr_comment">                    {</em>
-<a class="jxr_linenumber" name="354" href="#354">354</a> <em class="jxr_comment">                        JarEntry jarEntry = jarEntries.nextElement();</em>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_comment">                        InputStream jarEntryIs = jarFile.getInputStream( jarEntry );</em>
-<a class="jxr_linenumber" name="356" href="#356">356</a> 
-<a class="jxr_linenumber" name="357" href="#357">357</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( jarEntry.getName() ) );</em>
-<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_comment">                        IOUtils.copy( jarEntryIs, os );</em>
-<a class="jxr_linenumber" name="359" href="#359">359</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="360" href="#360">360</a> <em class="jxr_comment">                    }</em>
-<a class="jxr_linenumber" name="361" href="#361">361</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="362" href="#362">362</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="363" href="#363">363</a> 
-<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">            // add extra dependencies</em>
-<a class="jxr_linenumber" name="365" href="#365">365</a> <em class="jxr_comment">            if ( extraDependencies != null &amp;&amp; !extraDependencies.isEmpty() )</em>
-<a class="jxr_linenumber" name="366" href="#366">366</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">                for ( Dependency dependency : extraDependencies )</em>
-<a class="jxr_linenumber" name="368" href="#368">368</a> <em class="jxr_comment">                {</em>
-<a class="jxr_linenumber" name="369" href="#369">369</a> <em class="jxr_comment">                    // String groupId, String artifactId, String version, String scope, String type</em>
-<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_comment">                    Artifact artifact =</em>
-<a class="jxr_linenumber" name="371" href="#371">371</a> <em class="jxr_comment">                        artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em>
-<a class="jxr_linenumber" name="372" href="#372">372</a> <em class="jxr_comment">                                                        dependency.getVersion(), dependency.getScope(),</em>
-<a class="jxr_linenumber" name="373" href="#373">373</a> <em class="jxr_comment">                                                        dependency.getType() );</em>
-<a class="jxr_linenumber" name="374" href="#374">374</a> 
-<a class="jxr_linenumber" name="375" href="#375">375</a> <em class="jxr_comment">                    artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
-<a class="jxr_linenumber" name="376" href="#376">376</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( artifact.getFile() );</em>
-<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_comment">                    Enumeration&lt;JarEntry&gt; jarEntries = jarFile.entries();</em>
-<a class="jxr_linenumber" name="378" href="#378">378</a> <em class="jxr_comment">                    while ( jarEntries.hasMoreElements() )</em>
-<a class="jxr_linenumber" name="379" href="#379">379</a> <em class="jxr_comment">                    {</em>
-<a class="jxr_linenumber" name="380" href="#380">380</a> <em class="jxr_comment">                        JarEntry jarEntry = jarEntries.nextElement();</em>
-<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_comment">                        InputStream jarEntryIs = jarFile.getInputStream( jarEntry );</em>
+<a class="jxr_linenumber" name="351" href="#351">351</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
+<a class="jxr_linenumber" name="352" href="#352">352</a> <em class="jxr_comment">                }</em>
+<a class="jxr_linenumber" name="353" href="#353">353</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="354" href="#354">354</a> 
+<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_comment">            // add extra dependencies</em>
+<a class="jxr_linenumber" name="356" href="#356">356</a> <em class="jxr_comment">            if ( extraDependencies != null &amp;&amp; !extraDependencies.isEmpty() )</em>
+<a class="jxr_linenumber" name="357" href="#357">357</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_comment">                for ( Dependency dependency : extraDependencies )</em>
+<a class="jxr_linenumber" name="359" href="#359">359</a> <em class="jxr_comment">                {</em>
+<a class="jxr_linenumber" name="360" href="#360">360</a> <em class="jxr_comment">                    // String groupId, String artifactId, String version, String scope, String type</em>
+<a class="jxr_linenumber" name="361" href="#361">361</a> <em class="jxr_comment">                    Artifact artifact =</em>
+<a class="jxr_linenumber" name="362" href="#362">362</a> <em class="jxr_comment">                        artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em>
+<a class="jxr_linenumber" name="363" href="#363">363</a> <em class="jxr_comment">                                                        dependency.getVersion(), dependency.getScope(),</em>
+<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">                                                        dependency.getType() );</em>
+<a class="jxr_linenumber" name="365" href="#365">365</a> 
+<a class="jxr_linenumber" name="366" href="#366">366</a> <em class="jxr_comment">                    artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
+<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( artifact.getFile() );</em>
+<a class="jxr_linenumber" name="368" href="#368">368</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
+<a class="jxr_linenumber" name="369" href="#369">369</a> <em class="jxr_comment">                }</em>
+<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="371" href="#371">371</a> 
+<a class="jxr_linenumber" name="372" href="#372">372</a> <em class="jxr_comment">            Manifest manifest = new Manifest();</em>
+<a class="jxr_linenumber" name="373" href="#373">373</a> 
+<a class="jxr_linenumber" name="374" href="#374">374</a> <em class="jxr_comment">            Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em>
+<a class="jxr_linenumber" name="375" href="#375">375</a> <em class="jxr_comment">            mainClassAtt.setName( "Main-Class" );</em>
+<a class="jxr_linenumber" name="376" href="#376">376</a> <em class="jxr_comment">            mainClassAtt.setValue( mainClass );</em>
+<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_comment">            manifest.addConfiguredAttribute( mainClassAtt );</em>
+<a class="jxr_linenumber" name="378" href="#378">378</a> 
+<a class="jxr_linenumber" name="379" href="#379">379</a> <em class="jxr_comment">            manifest.write( tmpManifestWriter );</em>
+<a class="jxr_linenumber" name="380" href="#380">380</a> <em class="jxr_comment">            tmpManifestWriter.flush();</em>
+<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_comment">            tmpManifestWriter.close();</em>
 <a class="jxr_linenumber" name="382" href="#382">382</a> 
-<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( jarEntry.getName() ) );</em>
-<a class="jxr_linenumber" name="384" href="#384">384</a> <em class="jxr_comment">                        IOUtils.copy( jarEntryIs, os );</em>
-<a class="jxr_linenumber" name="385" href="#385">385</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="386" href="#386">386</a> <em class="jxr_comment">                    }</em>
-<a class="jxr_linenumber" name="387" href="#387">387</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="388" href="#388">388</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="389" href="#389">389</a> 
-<a class="jxr_linenumber" name="390" href="#390">390</a> <em class="jxr_comment">            Manifest manifest = new Manifest();</em>
-<a class="jxr_linenumber" name="391" href="#391">391</a> 
-<a class="jxr_linenumber" name="392" href="#392">392</a> <em class="jxr_comment">            Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em>
-<a class="jxr_linenumber" name="393" href="#393">393</a> <em class="jxr_comment">            mainClassAtt.setName( "Main-Class" );</em>
-<a class="jxr_linenumber" name="394" href="#394">394</a> <em class="jxr_comment">            mainClassAtt.setValue( mainClass );</em>
-<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_comment">            manifest.addConfiguredAttribute( mainClassAtt );</em>
-<a class="jxr_linenumber" name="396" href="#396">396</a> 
-<a class="jxr_linenumber" name="397" href="#397">397</a> <em class="jxr_comment">            manifest.write( tmpManifestWriter );</em>
-<a class="jxr_linenumber" name="398" href="#398">398</a> <em class="jxr_comment">            tmpManifestWriter.flush();</em>
-<a class="jxr_linenumber" name="399" href="#399">399</a> <em class="jxr_comment">            tmpManifestWriter.close();</em>
-<a class="jxr_linenumber" name="400" href="#400">400</a> 
-<a class="jxr_linenumber" name="401" href="#401">401</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em>
-<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em>
-<a class="jxr_linenumber" name="403" href="#403">403</a> <em class="jxr_comment">            os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="404" href="#404">404</a> 
-<a class="jxr_linenumber" name="405" href="#405">405</a> <em class="jxr_comment">            if ( attachArtifact )</em>
-<a class="jxr_linenumber" name="406" href="#406">406</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="407" href="#407">407</a> <em class="jxr_comment">                //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em>
-<a class="jxr_linenumber" name="408" href="#408">408</a> <em class="jxr_comment">                projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em>
-<a class="jxr_linenumber" name="409" href="#409">409</a> <em class="jxr_comment">                                              execWarJar );</em>
-<a class="jxr_linenumber" name="410" href="#410">410</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="411" href="#411">411</a> 
-<a class="jxr_linenumber" name="412" href="#412">412</a> <em class="jxr_comment">            if ( extraResources != null )</em>
-<a class="jxr_linenumber" name="413" href="#413">413</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="414" href="#414">414</a> <em class="jxr_comment">                for ( ExtraResource extraResource : extraResources )</em>
-<a class="jxr_linenumber" name="415" href="#415">415</a> <em class="jxr_comment">                {</em>
-<a class="jxr_linenumber" name="416" href="#416">416</a> 
-<a class="jxr_linenumber" name="417" href="#417">417</a> <em class="jxr_comment">                    DirectoryScanner directoryScanner = new DirectoryScanner();</em>
-<a class="jxr_linenumber" name="418" href="#418">418</a> <em class="jxr_comment">                    directoryScanner.setBasedir( extraResource.getDirectory() );</em>
-<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">                    directoryScanner.addDefaultExcludes();</em>
-<a class="jxr_linenumber" name="420" href="#420">420</a> <em class="jxr_comment">                    directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) );</em>
-<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_comment">                    directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) );</em>
-<a class="jxr_linenumber" name="422" href="#422">422</a> <em class="jxr_comment">                    directoryScanner.scan();</em>
-<a class="jxr_linenumber" name="423" href="#423">423</a> <em class="jxr_comment">                    for ( String includeFile : directoryScanner.getIncludedFiles() )</em>
-<a class="jxr_linenumber" name="424" href="#424">424</a> <em class="jxr_comment">                    {</em>
-<a class="jxr_linenumber" name="425" href="#425">425</a> <em class="jxr_comment">                        getLog().debug( "include file:" + includeFile );</em>
-<a class="jxr_linenumber" name="426" href="#426">426</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( includeFile ) );</em>
-<a class="jxr_linenumber" name="427" href="#427">427</a> <em class="jxr_comment">                        IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ),</em>
-<a class="jxr_linenumber" name="428" href="#428">428</a> <em class="jxr_comment">                                      os );</em>
-<a class="jxr_linenumber" name="429" href="#429">429</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="430" href="#430">430</a> <em class="jxr_comment">                    }</em>
-<a class="jxr_linenumber" name="431" href="#431">431</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="432" href="#432">432</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="433" href="#433">433</a> 
-<a class="jxr_linenumber" name="434" href="#434">434</a> <em class="jxr_comment">            if ( tomcatConfigurationFilesDirectory != null &amp;&amp; tomcatConfigurationFilesDirectory.exists() )</em>
-<a class="jxr_linenumber" name="435" href="#435">435</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="436" href="#436">436</a> <em class="jxr_comment">                // Because its the tomcat default dir for configs</em>
-<a class="jxr_linenumber" name="437" href="#437">437</a> <em class="jxr_comment">                String aConfigOutputDir = "conf/";</em>
-<a class="jxr_linenumber" name="438" href="#438">438</a> <em class="jxr_comment">                copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os );</em>
-<a class="jxr_linenumber" name="439" href="#439">439</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="440" href="#440">440</a> 
-<a class="jxr_linenumber" name="441" href="#441">441</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="442" href="#442">442</a> <em class="jxr_comment">        catch ( ManifestException e )</em>
-<a class="jxr_linenumber" name="443" href="#443">443</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="444" href="#444">444</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="445" href="#445">445</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="446" href="#446">446</a> <em class="jxr_comment">        catch ( IOException e )</em>
-<a class="jxr_linenumber" name="447" href="#447">447</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="448" href="#448">448</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="449" href="#449">449</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="450" href="#450">450</a> <em class="jxr_comment">        catch ( ArchiveException e )</em>
-<a class="jxr_linenumber" name="451" href="#451">451</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="452" href="#452">452</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="453" href="#453">453</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="454" href="#454">454</a> <em class="jxr_comment">        catch ( ArtifactNotFoundException e )</em>
-<a class="jxr_linenumber" name="455" href="#455">455</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="456" href="#456">456</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="457" href="#457">457</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="458" href="#458">458</a> <em class="jxr_comment">        catch ( ArtifactResolutionException e )</em>
-<a class="jxr_linenumber" name="459" href="#459">459</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="460" href="#460">460</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="461" href="#461">461</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="462" href="#462">462</a> <em class="jxr_comment">        finally</em>
-<a class="jxr_linenumber" name="463" href="#463">463</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="464" href="#464">464</a> <em class="jxr_comment">            IOUtils.closeQuietly( os );</em>
-<a class="jxr_linenumber" name="465" href="#465">465</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpManifestWriter );</em>
-<a class="jxr_linenumber" name="466" href="#466">466</a> <em class="jxr_comment">            IOUtils.closeQuietly( execWarJarOutputStream );</em>
-<a class="jxr_linenumber" name="467" href="#467">467</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpPropertiesFileOutputStream );</em>
-<a class="jxr_linenumber" name="468" href="#468">468</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="469" href="#469">469</a> <em class="jxr_comment">    }</em>
-<a class="jxr_linenumber" name="470" href="#470">470</a> 
-<a class="jxr_linenumber" name="471" href="#471">471</a> <em class="jxr_comment">    private void copyDirectoryContentIntoArchive( File pSourceFolder, String pDestinationPath,</em>
-<a class="jxr_linenumber" name="472" href="#472">472</a> <em class="jxr_comment">                                                  ArchiveOutputStream pArchiveOutputSteam )</em>
-<a class="jxr_linenumber" name="473" href="#473">473</a> <em class="jxr_comment">        throws FileNotFoundException, IOException</em>
-<a class="jxr_linenumber" name="474" href="#474">474</a> <em class="jxr_comment">    {</em>
+<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em>
+<a class="jxr_linenumber" name="384" href="#384">384</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em>
+<a class="jxr_linenumber" name="385" href="#385">385</a> <em class="jxr_comment">            os.closeArchiveEntry();</em>
+<a class="jxr_linenumber" name="386" href="#386">386</a> 
+<a class="jxr_linenumber" name="387" href="#387">387</a> <em class="jxr_comment">            if ( attachArtifact )</em>
+<a class="jxr_linenumber" name="388" href="#388">388</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_comment">                //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em>
+<a class="jxr_linenumber" name="390" href="#390">390</a> <em class="jxr_comment">                projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em>
+<a class="jxr_linenumber" name="391" href="#391">391</a> <em class="jxr_comment">                                              execWarJar );</em>
+<a class="jxr_linenumber" name="392" href="#392">392</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="393" href="#393">393</a> 
+<a class="jxr_linenumber" name="394" href="#394">394</a> <em class="jxr_comment">            if ( extraResources != null )</em>
+<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="396" href="#396">396</a> <em class="jxr_comment">                for ( ExtraResource extraResource : extraResources )</em>
+<a class="jxr_linenumber" name="397" href="#397">397</a> <em class="jxr_comment">                {</em>
+<a class="jxr_linenumber" name="398" href="#398">398</a> 
+<a class="jxr_linenumber" name="399" href="#399">399</a> <em class="jxr_comment">                    DirectoryScanner directoryScanner = new DirectoryScanner();</em>
+<a class="jxr_linenumber" name="400" href="#400">400</a> <em class="jxr_comment">                    directoryScanner.setBasedir( extraResource.getDirectory() );</em>
+<a class="jxr_linenumber" name="401" href="#401">401</a> <em class="jxr_comment">                    directoryScanner.addDefaultExcludes();</em>
+<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_comment">                    directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) );</em>
+<a class="jxr_linenumber" name="403" href="#403">403</a> <em class="jxr_comment">                    directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) );</em>
+<a class="jxr_linenumber" name="404" href="#404">404</a> <em class="jxr_comment">                    directoryScanner.scan();</em>
+<a class="jxr_linenumber" name="405" href="#405">405</a> <em class="jxr_comment">                    for ( String includeFile : directoryScanner.getIncludedFiles() )</em>
+<a class="jxr_linenumber" name="406" href="#406">406</a> <em class="jxr_comment">                    {</em>
+<a class="jxr_linenumber" name="407" href="#407">407</a> <em class="jxr_comment">                        getLog().debug( "include file:" + includeFile );</em>
+<a class="jxr_linenumber" name="408" href="#408">408</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( includeFile ) );</em>
+<a class="jxr_linenumber" name="409" href="#409">409</a> <em class="jxr_comment">                        IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ),</em>
+<a class="jxr_linenumber" name="410" href="#410">410</a> <em class="jxr_comment">                                      os );</em>
+<a class="jxr_linenumber" name="411" href="#411">411</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
+<a class="jxr_linenumber" name="412" href="#412">412</a> <em class="jxr_comment">                    }</em>
+<a class="jxr_linenumber" name="413" href="#413">413</a> <em class="jxr_comment">                }</em>
+<a class="jxr_linenumber" name="414" href="#414">414</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="415" href="#415">415</a> 
+<a class="jxr_linenumber" name="416" href="#416">416</a> <em class="jxr_comment">            if ( tomcatConfigurationFilesDirectory != null &amp;&amp; tomcatConfigurationFilesDirectory.exists() )</em>
+<a class="jxr_linenumber" name="417" href="#417">417</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="418" href="#418">418</a> <em class="jxr_comment">                // Because its the tomcat default dir for configs</em>
+<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">                String aConfigOutputDir = "conf/";</em>
+<a class="jxr_linenumber" name="420" href="#420">420</a> <em class="jxr_comment">                copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os );</em>
+<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="422" href="#422">422</a> 
+<a class="jxr_linenumber" name="423" href="#423">423</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="424" href="#424">424</a> <em class="jxr_comment">        catch ( ManifestException e )</em>
+<a class="jxr_linenumber" name="425" href="#425">425</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="426" href="#426">426</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
+<a class="jxr_linenumber" name="427" href="#427">427</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="428" href="#428">428</a> <em class="jxr_comment">        catch ( IOException e )</em>
+<a class="jxr_linenumber" name="429" href="#429">429</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="430" href="#430">430</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
+<a class="jxr_linenumber" name="431" href="#431">431</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="432" href="#432">432</a> <em class="jxr_comment">        catch ( ArchiveException e )</em>
+<a class="jxr_linenumber" name="433" href="#433">433</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="434" href="#434">434</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
+<a class="jxr_linenumber" name="435" href="#435">435</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="436" href="#436">436</a> <em class="jxr_comment">        catch ( ArtifactNotFoundException e )</em>
+<a class="jxr_linenumber" name="437" href="#437">437</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="438" href="#438">438</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
+<a class="jxr_linenumber" name="439" href="#439">439</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="440" href="#440">440</a> <em class="jxr_comment">        catch ( ArtifactResolutionException e )</em>
+<a class="jxr_linenumber" name="441" href="#441">441</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="442" href="#442">442</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
+<a class="jxr_linenumber" name="443" href="#443">443</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="444" href="#444">444</a> <em class="jxr_comment">        finally</em>
+<a class="jxr_linenumber" name="445" href="#445">445</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="446" href="#446">446</a> <em class="jxr_comment">            IOUtils.closeQuietly( os );</em>
+<a class="jxr_linenumber" name="447" href="#447">447</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpManifestWriter );</em>
+<a class="jxr_linenumber" name="448" href="#448">448</a> <em class="jxr_comment">            IOUtils.closeQuietly( execWarJarOutputStream );</em>
+<a class="jxr_linenumber" name="449" href="#449">449</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpPropertiesFileOutputStream );</em>
+<a class="jxr_linenumber" name="450" href="#450">450</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="451" href="#451">451</a> <em class="jxr_comment">    }</em>
+<a class="jxr_linenumber" name="452" href="#452">452</a> 
+<a class="jxr_linenumber" name="453" href="#453">453</a> <em class="jxr_comment">    protected void copyDirectoryContentIntoArchive( File pSourceFolder, String pDestinationPath,</em>
+<a class="jxr_linenumber" name="454" href="#454">454</a> <em class="jxr_comment">                                                    ArchiveOutputStream pArchiveOutputSteam )</em>
+<a class="jxr_linenumber" name="455" href="#455">455</a> <em class="jxr_comment">        throws FileNotFoundException, IOException</em>
+<a class="jxr_linenumber" name="456" href="#456">456</a> <em class="jxr_comment">    {</em>
+<a class="jxr_linenumber" name="457" href="#457">457</a> 
+<a class="jxr_linenumber" name="458" href="#458">458</a> <em class="jxr_comment">        // Scan the directory</em>
+<a class="jxr_linenumber" name="459" href="#459">459</a> <em class="jxr_comment">        DirectoryScanner directoryScanner = new DirectoryScanner();</em>
+<a class="jxr_linenumber" name="460" href="#460">460</a> <em class="jxr_comment">        directoryScanner.setBasedir( pSourceFolder );</em>
+<a class="jxr_linenumber" name="461" href="#461">461</a> <em class="jxr_comment">        directoryScanner.addDefaultExcludes();</em>
+<a class="jxr_linenumber" name="462" href="#462">462</a> <em class="jxr_comment">        directoryScanner.scan();</em>
+<a class="jxr_linenumber" name="463" href="#463">463</a> 
+<a class="jxr_linenumber" name="464" href="#464">464</a> <em class="jxr_comment">        // Each File</em>
+<a class="jxr_linenumber" name="465" href="#465">465</a> <em class="jxr_comment">        for ( String aIncludeFileName : directoryScanner.getIncludedFiles() )</em>
+<a class="jxr_linenumber" name="466" href="#466">466</a> <em class="jxr_comment">        {</em>
+<a class="jxr_linenumber" name="467" href="#467">467</a> <em class="jxr_comment">            getLog().debug( "include configuration file : " + pDestinationPath + aIncludeFileName );</em>
+<a class="jxr_linenumber" name="468" href="#468">468</a> <em class="jxr_comment">            File aInputFile = new File( pSourceFolder, aIncludeFileName );</em>
+<a class="jxr_linenumber" name="469" href="#469">469</a> 
+<a class="jxr_linenumber" name="470" href="#470">470</a> <em class="jxr_comment">            FileInputStream aSourceFileInputStream = new FileInputStream( aInputFile );</em>
+<a class="jxr_linenumber" name="471" href="#471">471</a> 
+<a class="jxr_linenumber" name="472" href="#472">472</a> <em class="jxr_comment">            pArchiveOutputSteam.putArchiveEntry( new JarArchiveEntry( pDestinationPath + aIncludeFileName ) );</em>
+<a class="jxr_linenumber" name="473" href="#473">473</a> <em class="jxr_comment">            IOUtils.copy( aSourceFileInputStream, pArchiveOutputSteam );</em>
+<a class="jxr_linenumber" name="474" href="#474">474</a> <em class="jxr_comment">            pArchiveOutputSteam.closeArchiveEntry();</em>
 <a class="jxr_linenumber" name="475" href="#475">475</a> 
-<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">        // Scan the directory</em>
-<a class="jxr_linenumber" name="477" href="#477">477</a> <em class="jxr_comment">        DirectoryScanner directoryScanner = new DirectoryScanner();</em>
-<a class="jxr_linenumber" name="478" href="#478">478</a> <em class="jxr_comment">        directoryScanner.setBasedir( pSourceFolder );</em>
-<a class="jxr_linenumber" name="479" href="#479">479</a> <em class="jxr_comment">        directoryScanner.addDefaultExcludes();</em>
-<a class="jxr_linenumber" name="480" href="#480">480</a> <em class="jxr_comment">        directoryScanner.scan();</em>
-<a class="jxr_linenumber" name="481" href="#481">481</a> 
-<a class="jxr_linenumber" name="482" href="#482">482</a> <em class="jxr_comment">        // Each File</em>
-<a class="jxr_linenumber" name="483" href="#483">483</a> <em class="jxr_comment">        for ( String aIncludeFileName : directoryScanner.getIncludedFiles() )</em>
-<a class="jxr_linenumber" name="484" href="#484">484</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="485" href="#485">485</a> <em class="jxr_comment">            getLog().debug( "include configuration file : " + pDestinationPath + aIncludeFileName );</em>
-<a class="jxr_linenumber" name="486" href="#486">486</a> <em class="jxr_comment">            File aInputFile = new File( pSourceFolder, aIncludeFileName );</em>
-<a class="jxr_linenumber" name="487" href="#487">487</a> 
-<a class="jxr_linenumber" name="488" href="#488">488</a> <em class="jxr_comment">            FileInputStream aSourceFileInputStream = new FileInputStream( aInputFile );</em>
-<a class="jxr_linenumber" name="489" href="#489">489</a> 
-<a class="jxr_linenumber" name="490" href="#490">490</a> <em class="jxr_comment">            pArchiveOutputSteam.putArchiveEntry( new JarArchiveEntry( pDestinationPath + aIncludeFileName ) );</em>
-<a class="jxr_linenumber" name="491" href="#491">491</a> <em class="jxr_comment">            IOUtils.copy( aSourceFileInputStream, pArchiveOutputSteam );</em>
-<a class="jxr_linenumber" name="492" href="#492">492</a> <em class="jxr_comment">            pArchiveOutputSteam.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="493" href="#493">493</a> 
-<a class="jxr_linenumber" name="494" href="#494">494</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="495" href="#495">495</a> 
-<a class="jxr_linenumber" name="496" href="#496">496</a> <em class="jxr_comment">    }</em>
-<a class="jxr_linenumber" name="497" href="#497">497</a> 
-<a class="jxr_linenumber" name="498" href="#498">498</a> <em class="jxr_comment">    /**</em>
-<a class="jxr_linenumber" name="499" href="#499">499</a> <em class="jxr_comment">     * Resolves the plugin work dir as a sub directory of {@link #buildDirectory}, creating it if it does not exist.</em>
-<a class="jxr_linenumber" name="500" href="#500">500</a> <em class="jxr_comment">     *</em>
-<a class="jxr_linenumber" name="501" href="#501">501</a> <em class="jxr_comment">     * @return File representing the resolved plugin work dir</em>
-<a class="jxr_linenumber" name="502" href="#502">502</a> <em class="jxr_comment">     * @throws MojoExecutionException if the plugin work dir cannot be created</em>
-<a class="jxr_linenumber" name="503" href="#503">503</a> <em class="jxr_comment">     */</em>
-<a class="jxr_linenumber" name="504" href="#504">504</a>     <strong class="jxr_keyword">protected</strong> File resolvePluginWorkDir()
-<a class="jxr_linenumber" name="505" href="#505">505</a>         <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="506" href="#506">506</a>     {
-<a class="jxr_linenumber" name="507" href="#507">507</a>         <strong class="jxr_keyword">if</strong> ( !pluginWorkDirectory.exists() &amp;&amp; !pluginWorkDirectory.mkdirs() )
+<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">        }</em>
+<a class="jxr_linenumber" name="477" href="#477">477</a> 
+<a class="jxr_linenumber" name="478" href="#478">478</a> <em class="jxr_comment">    }</em>
+<a class="jxr_linenumber" name="479" href="#479">479</a> 
+<a class="jxr_linenumber" name="480" href="#480">480</a> <em class="jxr_comment">    /**</em>
+<a class="jxr_linenumber" name="481" href="#481">481</a> <em class="jxr_comment">     * Resolves the plugin work dir as a sub directory of {@link #buildDirectory}, creating it if it does not exist.</em>
+<a class="jxr_linenumber" name="482" href="#482">482</a> <em class="jxr_comment">     *</em>
+<a class="jxr_linenumber" name="483" href="#483">483</a> <em class="jxr_comment">     * @return File representing the resolved plugin work dir</em>
+<a class="jxr_linenumber" name="484" href="#484">484</a> <em class="jxr_comment">     * @throws MojoExecutionException if the plugin work dir cannot be created</em>
+<a class="jxr_linenumber" name="485" href="#485">485</a> <em class="jxr_comment">     */</em>
+<a class="jxr_linenumber" name="486" href="#486">486</a>     <strong class="jxr_keyword">protected</strong> File resolvePluginWorkDir()
+<a class="jxr_linenumber" name="487" href="#487">487</a>         <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="488" href="#488">488</a>     {
+<a class="jxr_linenumber" name="489" href="#489">489</a>         <strong class="jxr_keyword">if</strong> ( !pluginWorkDirectory.exists() &amp;&amp; !pluginWorkDirectory.mkdirs() )
+<a class="jxr_linenumber" name="490" href="#490">490</a>         {
+<a class="jxr_linenumber" name="491" href="#491">491</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException(
+<a class="jxr_linenumber" name="492" href="#492">492</a>                 <span class="jxr_string">"Could not create plugin work directory at "</span> + pluginWorkDirectory.getAbsolutePath() );
+<a class="jxr_linenumber" name="493" href="#493">493</a>         }
+<a class="jxr_linenumber" name="494" href="#494">494</a> 
+<a class="jxr_linenumber" name="495" href="#495">495</a>         <strong class="jxr_keyword">return</strong> pluginWorkDirectory;
+<a class="jxr_linenumber" name="496" href="#496">496</a> 
+<a class="jxr_linenumber" name="497" href="#497">497</a>     }
+<a class="jxr_linenumber" name="498" href="#498">498</a> 
+<a class="jxr_linenumber" name="499" href="#499">499</a>     <strong class="jxr_keyword">protected</strong> String[] toStringArray( List list )
+<a class="jxr_linenumber" name="500" href="#500">500</a>     {
+<a class="jxr_linenumber" name="501" href="#501">501</a>         <strong class="jxr_keyword">if</strong> ( list == <strong class="jxr_keyword">null</strong> || list.isEmpty() )
+<a class="jxr_linenumber" name="502" href="#502">502</a>         {
+<a class="jxr_linenumber" name="503" href="#503">503</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> String[0];
+<a class="jxr_linenumber" name="504" href="#504">504</a>         }
+<a class="jxr_linenumber" name="505" href="#505">505</a>         List&lt;String&gt; res = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;( list.size() );
+<a class="jxr_linenumber" name="506" href="#506">506</a> 
+<a class="jxr_linenumber" name="507" href="#507">507</a>         <strong class="jxr_keyword">for</strong> ( Iterator ite = list.iterator(); ite.hasNext(); )
 <a class="jxr_linenumber" name="508" href="#508">508</a>         {
-<a class="jxr_linenumber" name="509" href="#509">509</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException(
-<a class="jxr_linenumber" name="510" href="#510">510</a>                 <span class="jxr_string">"Could not create plugin work directory at "</span> + pluginWorkDirectory.getAbsolutePath() );
-<a class="jxr_linenumber" name="511" href="#511">511</a>         }
-<a class="jxr_linenumber" name="512" href="#512">512</a> 
-<a class="jxr_linenumber" name="513" href="#513">513</a>         <strong class="jxr_keyword">return</strong> pluginWorkDirectory;
+<a class="jxr_linenumber" name="509" href="#509">509</a>             res.add( (String) ite.next() );
+<a class="jxr_linenumber" name="510" href="#510">510</a>         }
+<a class="jxr_linenumber" name="511" href="#511">511</a>         <strong class="jxr_keyword">return</strong> res.toArray( <strong class="jxr_keyword">new</strong> String[res.size()] );
+<a class="jxr_linenumber" name="512" href="#512">512</a>     }
+<a class="jxr_linenumber" name="513" href="#513">513</a> 
 <a class="jxr_linenumber" name="514" href="#514">514</a> 
-<a class="jxr_linenumber" name="515" href="#515">515</a>     }
-<a class="jxr_linenumber" name="516" href="#516">516</a> 
-<a class="jxr_linenumber" name="517" href="#517">517</a>     <strong class="jxr_keyword">private</strong> String[] toStringArray( List list )
-<a class="jxr_linenumber" name="518" href="#518">518</a>     {
-<a class="jxr_linenumber" name="519" href="#519">519</a>         <strong class="jxr_keyword">if</strong> ( list == <strong class="jxr_keyword">null</strong> || list.isEmpty() )
-<a class="jxr_linenumber" name="520" href="#520">520</a>         {
-<a class="jxr_linenumber" name="521" href="#521">521</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> String[0];
-<a class="jxr_linenumber" name="522" href="#522">522</a>         }
-<a class="jxr_linenumber" name="523" href="#523">523</a>         List&lt;String&gt; res = <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;( list.size() );
-<a class="jxr_linenumber" name="524" href="#524">524</a> 
-<a class="jxr_linenumber" name="525" href="#525">525</a>         <strong class="jxr_keyword">for</strong> ( Iterator ite = list.iterator(); ite.hasNext(); )
-<a class="jxr_linenumber" name="526" href="#526">526</a>         {
-<a class="jxr_linenumber" name="527" href="#527">527</a>             res.add( (String) ite.next() );
-<a class="jxr_linenumber" name="528" href="#528">528</a>         }
-<a class="jxr_linenumber" name="529" href="#529">529</a>         <strong class="jxr_keyword">return</strong> res.toArray( <strong class="jxr_keyword">new</strong> String[res.size()] );
-<a class="jxr_linenumber" name="530" href="#530">530</a>     }
-<a class="jxr_linenumber" name="531" href="#531">531</a> 
-<a class="jxr_linenumber" name="532" href="#532">532</a> 
-<a class="jxr_linenumber" name="533" href="#533">533</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="534" href="#534">534</a> <em class="jxr_javadoccomment">     * return file can be deleted</em>
-<a class="jxr_linenumber" name="535" href="#535">535</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="536" href="#536">536</a>     <strong class="jxr_keyword">private</strong> File addContextXmlToWar( File contextXmlFile, File warFile )
-<a class="jxr_linenumber" name="537" href="#537">537</a>         <strong class="jxr_keyword">throws</strong> IOException, ArchiveException
-<a class="jxr_linenumber" name="538" href="#538">538</a>     {
-<a class="jxr_linenumber" name="539" href="#539">539</a>         ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="540" href="#540">540</a>         OutputStream warOutputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="541" href="#541">541</a>         File tmpWar = File.createTempFile( <span class="jxr_string">"tomcat"</span>, <span class="jxr_string">"war-exec"</span> );
-<a class="jxr_linenumber" name="542" href="#542">542</a>         tmpWar.deleteOnExit();
-<a class="jxr_linenumber" name="543" href="#543">543</a> 
-<a class="jxr_linenumber" name="544" href="#544">544</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="545" href="#545">545</a>         {
-<a class="jxr_linenumber" name="546" href="#546">546</a>             warOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpWar );
-<a class="jxr_linenumber" name="547" href="#547">547</a>             os = <strong class="jxr_keyword">new</strong> ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR, warOutputStream );
-<a class="jxr_linenumber" name="548" href="#548">548</a>             os.putArchiveEntry( <strong class="jxr_keyword">new</strong> JarArchiveEntry( <span class="jxr_string">"META-INF/context.xml"</span> ) );
-<a class="jxr_linenumber" name="549" href="#549">549</a>             IOUtils.copy( <strong class="jxr_keyword">new</strong> FileInputStream( contextXmlFile ), os );
-<a class="jxr_linenumber" name="550" href="#550">550</a>             os.closeArchiveEntry();
-<a class="jxr_linenumber" name="551" href="#551">551</a> 
-<a class="jxr_linenumber" name="552" href="#552">552</a>             JarFile jarFile = <strong class="jxr_keyword">new</strong> JarFile( warFile );
-<a class="jxr_linenumber" name="553" href="#553">553</a>             Enumeration&lt;JarEntry&gt; jarEntries = jarFile.entries();
-<a class="jxr_linenumber" name="554" href="#554">554</a>             <strong class="jxr_keyword">while</strong> ( jarEntries.hasMoreElements() )
-<a class="jxr_linenumber" name="555" href="#555">555</a>             {
-<a class="jxr_linenumber" name="556" href="#556">556</a>                 JarEntry jarEntry = jarEntries.nextElement();
-<a class="jxr_linenumber" name="557" href="#557">557</a>                 os.putArchiveEntry( <strong class="jxr_keyword">new</strong> JarArchiveEntry( jarEntry.getName() ) );
-<a class="jxr_linenumber" name="558" href="#558">558</a>                 IOUtils.copy( jarFile.getInputStream( jarEntry ), os );
-<a class="jxr_linenumber" name="559" href="#559">559</a>                 os.closeArchiveEntry();
-<a class="jxr_linenumber" name="560" href="#560">560</a>             }
-<a class="jxr_linenumber" name="561" href="#561">561</a>             os.flush();
-<a class="jxr_linenumber" name="562" href="#562">562</a>         }
-<a class="jxr_linenumber" name="563" href="#563">563</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="564" href="#564">564</a>         {
-<a class="jxr_linenumber" name="565" href="#565">565</a>             IOUtils.closeQuietly( os );
-<a class="jxr_linenumber" name="566" href="#566">566</a>             IOUtils.closeQuietly( warOutputStream );
+<a class="jxr_linenumber" name="515" href="#515">515</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="516" href="#516">516</a> <em class="jxr_javadoccomment">     * return file can be deleted</em>
+<a class="jxr_linenumber" name="517" href="#517">517</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="518" href="#518">518</a>     <strong class="jxr_keyword">protected</strong> File addContextXmlToWar( File contextXmlFile, File warFile )
+<a class="jxr_linenumber" name="519" href="#519">519</a>         <strong class="jxr_keyword">throws</strong> IOException, ArchiveException
+<a class="jxr_linenumber" name="520" href="#520">520</a>     {
+<a class="jxr_linenumber" name="521" href="#521">521</a>         ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="522" href="#522">522</a>         OutputStream warOutputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="523" href="#523">523</a>         File tmpWar = File.createTempFile( <span class="jxr_string">"tomcat"</span>, <span class="jxr_string">"war-exec"</span> );
+<a class="jxr_linenumber" name="524" href="#524">524</a>         tmpWar.deleteOnExit();
+<a class="jxr_linenumber" name="525" href="#525">525</a> 
+<a class="jxr_linenumber" name="526" href="#526">526</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="527" href="#527">527</a>         {
+<a class="jxr_linenumber" name="528" href="#528">528</a>             warOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpWar );
+<a class="jxr_linenumber" name="529" href="#529">529</a>             os = <strong class="jxr_keyword">new</strong> ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR, warOutputStream );
+<a class="jxr_linenumber" name="530" href="#530">530</a>             os.putArchiveEntry( <strong class="jxr_keyword">new</strong> JarArchiveEntry( <span class="jxr_string">"META-INF/context.xml"</span> ) );
+<a class="jxr_linenumber" name="531" href="#531">531</a>             IOUtils.copy( <strong class="jxr_keyword">new</strong> FileInputStream( contextXmlFile ), os );
+<a class="jxr_linenumber" name="532" href="#532">532</a>             os.closeArchiveEntry();
+<a class="jxr_linenumber" name="533" href="#533">533</a> 
+<a class="jxr_linenumber" name="534" href="#534">534</a>             JarFile jarFile = <strong class="jxr_keyword">new</strong> JarFile( warFile );
+<a class="jxr_linenumber" name="535" href="#535">535</a>             extractJarToArchive( jarFile, os );
+<a class="jxr_linenumber" name="536" href="#536">536</a>             os.flush();
+<a class="jxr_linenumber" name="537" href="#537">537</a>         }
+<a class="jxr_linenumber" name="538" href="#538">538</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="539" href="#539">539</a>         {
+<a class="jxr_linenumber" name="540" href="#540">540</a>             IOUtils.closeQuietly( os );
+<a class="jxr_linenumber" name="541" href="#541">541</a>             IOUtils.closeQuietly( warOutputStream );
+<a class="jxr_linenumber" name="542" href="#542">542</a>         }
+<a class="jxr_linenumber" name="543" href="#543">543</a>         <strong class="jxr_keyword">return</strong> tmpWar;
+<a class="jxr_linenumber" name="544" href="#544">544</a>     }
+<a class="jxr_linenumber" name="545" href="#545">545</a> 
+<a class="jxr_linenumber" name="546" href="#546">546</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="547" href="#547">547</a> <em class="jxr_javadoccomment">     * Copy the contents of a jar file to another archive</em>
+<a class="jxr_linenumber" name="548" href="#548">548</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="549" href="#549">549</a> <em class="jxr_javadoccomment">     * @param file The input jar file</em>
+<a class="jxr_linenumber" name="550" href="#550">550</a> <em class="jxr_javadoccomment">     * @param os   The output archive</em>
+<a class="jxr_linenumber" name="551" href="#551">551</a> <em class="jxr_javadoccomment">     * @throws IOException</em>
+<a class="jxr_linenumber" name="552" href="#552">552</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="553" href="#553">553</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> extractJarToArchive( JarFile file, ArchiveOutputStream os )
+<a class="jxr_linenumber" name="554" href="#554">554</a>         <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="555" href="#555">555</a>     {
+<a class="jxr_linenumber" name="556" href="#556">556</a>         Enumeration&lt;? <strong class="jxr_keyword">extends</strong> JarEntry&gt; entries = file.entries();
+<a class="jxr_linenumber" name="557" href="#557">557</a>         <strong class="jxr_keyword">while</strong> ( entries.hasMoreElements() )
+<a class="jxr_linenumber" name="558" href="#558">558</a>         {
+<a class="jxr_linenumber" name="559" href="#559">559</a>             JarEntry j = entries.nextElement();
+<a class="jxr_linenumber" name="560" href="#560">560</a>             os.putArchiveEntry( <strong class="jxr_keyword">new</strong> JarArchiveEntry( j.getName() ) );
+<a class="jxr_linenumber" name="561" href="#561">561</a>             IOUtils.copy( file.getInputStream( j ), os );
+<a class="jxr_linenumber" name="562" href="#562">562</a>             os.closeArchiveEntry();
+<a class="jxr_linenumber" name="563" href="#563">563</a>         }
+<a class="jxr_linenumber" name="564" href="#564">564</a>         <strong class="jxr_keyword">if</strong> ( file != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="565" href="#565">565</a>         {
+<a class="jxr_linenumber" name="566" href="#566">566</a>             file.close();
 <a class="jxr_linenumber" name="567" href="#567">567</a>         }
-<a class="jxr_linenumber" name="568" href="#568">568</a>         <strong class="jxr_keyword">return</strong> tmpWar;
-<a class="jxr_linenumber" name="569" href="#569">569</a>     }
-<a class="jxr_linenumber" name="570" href="#570">570</a> }
+<a class="jxr_linenumber" name="568" href="#568">568</a>     }
+<a class="jxr_linenumber" name="569" href="#569">569</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org