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 2013/11/04 02:36:30 UTC

svn commit: r1538487 [9/13] - in /tomcat/site/trunk/docs/maven-plugin-trunk: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/config/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomcat6/ apidocs/o...

Modified: tomcat/site/trunk/docs/maven-plugin-trunk/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-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html?rev=1538487&r1=1538486&r2=1538487&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html Mon Nov  4 01:36:24 2013
@@ -113,485 +113,499 @@
 <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="106" href="#106">106</a>     <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment">     * Skip the execution</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">     * @since 2.2</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.skip"</span>, defaultValue = <span class="jxr_string">"false"</span> )
-<a class="jxr_linenumber" name="111" href="#111">111</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> skip;
-<a class="jxr_linenumber" name="112" href="#112">112</a> 
-<a class="jxr_linenumber" name="113" href="#113">113</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_javadoccomment">     * The webapp context path to use for the web application being run.</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment">     * The name to store webapp in exec jar. Do not use /</em>
-<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="117" href="#117">117</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="118" href="#118">118</a>     <strong class="jxr_keyword">protected</strong> String path;
-<a class="jxr_linenumber" name="119" href="#119">119</a> 
-<a class="jxr_linenumber" name="120" href="#120">120</a>     @Parameter
-<a class="jxr_linenumber" name="121" href="#121">121</a>     <strong class="jxr_keyword">protected</strong> List&lt;WarRunDependency&gt; warRunDependencies;
-<a class="jxr_linenumber" name="122" href="#122">122</a> 
-<a class="jxr_linenumber" name="123" href="#123">123</a>     @Component
-<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">protected</strong> ArtifactResolver artifactResolver;
-<a class="jxr_linenumber" name="125" href="#125">125</a> 
-<a class="jxr_linenumber" name="126" href="#126">126</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment">     * Maven Artifact Factory component.</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a>     @Component
-<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">protected</strong> ArtifactFactory artifactFactory;
-<a class="jxr_linenumber" name="131" href="#131">131</a> 
-<a class="jxr_linenumber" name="132" href="#132">132</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment">     * Location of the local repository.</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="135" href="#135">135</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="136" href="#136">136</a>     <strong class="jxr_keyword">protected</strong> ArtifactRepository local;
-<a class="jxr_linenumber" name="137" href="#137">137</a> 
-<a class="jxr_linenumber" name="138" href="#138">138</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_javadoccomment">     * List of Remote Repositories used by the resolver</em>
-<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>     @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="142" href="#142">142</a>     <strong class="jxr_keyword">protected</strong> List&lt;ArtifactRepository&gt; remoteRepos;
-<a class="jxr_linenumber" name="143" href="#143">143</a> 
-<a class="jxr_linenumber" name="144" href="#144">144</a>     @Component
-<a class="jxr_linenumber" name="145" href="#145">145</a>     <strong class="jxr_keyword">protected</strong> MavenProjectHelper projectHelper;
-<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">     * 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="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.attachArtifact"</span>, defaultValue = <span class="jxr_string">"true"</span>, required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="151" href="#151">151</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> attachArtifact;
-<a class="jxr_linenumber" name="152" href="#152">152</a> 
+<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">     * @since 2.2</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a>     @Parameter(property = <span class="jxr_string">"maven.tomcat.skip"</span>, defaultValue = <span class="jxr_string">"false"</span>)
+<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> skip;
+<a class="jxr_linenumber" name="113" href="#113">113</a> 
+<a class="jxr_linenumber" name="114" href="#114">114</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment">     * The webapp context path to use for the web application being run.</em>
+<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_javadoccomment">     * The name to store webapp in exec jar. Do not use /</em>
+<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="118" href="#118">118</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="119" href="#119">119</a>     <strong class="jxr_keyword">protected</strong> String path;
+<a class="jxr_linenumber" name="120" href="#120">120</a> 
+<a class="jxr_linenumber" name="121" href="#121">121</a>     @Parameter
+<a class="jxr_linenumber" name="122" href="#122">122</a>     <strong class="jxr_keyword">protected</strong> List&lt;WarRunDependency&gt; warRunDependencies;
+<a class="jxr_linenumber" name="123" href="#123">123</a> 
+<a class="jxr_linenumber" name="124" href="#124">124</a>     @Component
+<a class="jxr_linenumber" name="125" href="#125">125</a>     <strong class="jxr_keyword">protected</strong> ArtifactResolver artifactResolver;
+<a class="jxr_linenumber" name="126" href="#126">126</a> 
+<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> <em class="jxr_javadoccomment">     * Maven Artifact Factory component.</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="130" href="#130">130</a>     @Component
+<a class="jxr_linenumber" name="131" href="#131">131</a>     <strong class="jxr_keyword">protected</strong> ArtifactFactory artifactFactory;
+<a class="jxr_linenumber" name="132" href="#132">132</a> 
+<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> <em class="jxr_javadoccomment">     * Location of the local repository.</em>
+<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="136" href="#136">136</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="137" href="#137">137</a>     <strong class="jxr_keyword">protected</strong> ArtifactRepository local;
+<a class="jxr_linenumber" name="138" href="#138">138</a> 
+<a class="jxr_linenumber" name="139" href="#139">139</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_javadoccomment">     * List of Remote Repositories used by the resolver</em>
+<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="142" href="#142">142</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="143" href="#143">143</a>     <strong class="jxr_keyword">protected</strong> List&lt;ArtifactRepository&gt; remoteRepos;
+<a class="jxr_linenumber" name="144" href="#144">144</a> 
+<a class="jxr_linenumber" name="145" href="#145">145</a>     @Component
+<a class="jxr_linenumber" name="146" href="#146">146</a>     <strong class="jxr_keyword">protected</strong> MavenProjectHelper projectHelper;
+<a class="jxr_linenumber" name="147" href="#147">147</a> 
+<a class="jxr_linenumber" name="148" href="#148">148</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="149" href="#149">149</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="150" href="#150">150</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="151" href="#151">151</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="152" href="#152">152</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> attachArtifact;
 <a class="jxr_linenumber" name="153" href="#153">153</a> 
-<a class="jxr_linenumber" name="154" href="#154">154</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_javadoccomment">     * the classifier to use for the attached/generated artifact</em>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="157" href="#157">157</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="158" href="#158">158</a>                required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifier;
-<a class="jxr_linenumber" name="160" href="#160">160</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 classifier 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.attachArtifactClassifier"</span>, defaultValue = <span class="jxr_string">"exec-war"</span>,
+<a class="jxr_linenumber" name="159" href="#159">159</a>                required = <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="160" href="#160">160</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifier;
 <a class="jxr_linenumber" name="161" href="#161">161</a> 
-<a class="jxr_linenumber" name="162" href="#162">162</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_javadoccomment">     * the type to use for the attached/generated artifact</em>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="165" href="#165">165</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="166" href="#166">166</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifierType;
-<a class="jxr_linenumber" name="167" href="#167">167</a> 
-<a class="jxr_linenumber" name="168" href="#168">168</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_javadoccomment">     * to enable naming when starting tomcat</em>
-<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="171" href="#171">171</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="172" href="#172">172</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> enableNaming;
-<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">     * 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="176" href="#176">176</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="177" href="#177">177</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="178" href="#178">178</a>                required = <strong class="jxr_keyword">true</strong>)
-<a class="jxr_linenumber" name="179" href="#179">179</a>     <strong class="jxr_keyword">protected</strong> String accessLogValveFormat;
-<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 dependencies to add in the standalone tomcat jar: your jdbc driver, mail.jar etc..</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_javadoccomment">     * &lt;b&gt;Those dependencies will be in root classloader.&lt;/b&gt;</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="185" href="#185">185</a>     @Parameter
-<a class="jxr_linenumber" name="186" href="#186">186</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraDependency&gt; extraDependencies;
-<a class="jxr_linenumber" name="187" href="#187">187</a> 
-<a class="jxr_linenumber" name="188" href="#188">188</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="189" href="#189">189</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="190" href="#190">190</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="191" href="#191">191</a>     @Parameter
-<a class="jxr_linenumber" name="192" href="#192">192</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraResource&gt; extraResources;
-<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">     * Main class to use for starting the standalone jar.</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.mainClass"</span>,
-<a class="jxr_linenumber" name="198" href="#198">198</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="199" href="#199">199</a>     <strong class="jxr_keyword">protected</strong> String mainClass;
-<a class="jxr_linenumber" name="200" href="#200">200</a> 
-<a class="jxr_linenumber" name="201" href="#201">201</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="202" href="#202">202</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="203" href="#203">203</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="204" href="#204">204</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="205" href="#205">205</a>     <strong class="jxr_keyword">protected</strong> String connectorHttpProtocol;
-<a class="jxr_linenumber" name="206" href="#206">206</a> 
-<a class="jxr_linenumber" name="207" href="#207">207</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> execute()
-<a class="jxr_linenumber" name="208" href="#208">208</a>         <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException
-<a class="jxr_linenumber" name="209" href="#209">209</a>     {
-<a class="jxr_linenumber" name="210" href="#210">210</a>         <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">this</strong>.skip )
-<a class="jxr_linenumber" name="211" href="#211">211</a>         {
-<a class="jxr_linenumber" name="212" href="#212">212</a>             getLog().info( <span class="jxr_string">"skip execution"</span> );
-<a class="jxr_linenumber" name="213" href="#213">213</a>             <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="214" href="#214">214</a>         }
-<a class="jxr_linenumber" name="215" href="#215">215</a>         <em class="jxr_comment">//project.addAttachedArtifact(  );</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a>         File warExecFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName );
-<a class="jxr_linenumber" name="217" href="#217">217</a>         <strong class="jxr_keyword">if</strong> ( warExecFile.exists() )
-<a class="jxr_linenumber" name="218" href="#218">218</a>         {
-<a class="jxr_linenumber" name="219" href="#219">219</a>             warExecFile.delete();
-<a class="jxr_linenumber" name="220" href="#220">220</a>         }
-<a class="jxr_linenumber" name="221" href="#221">221</a> 
-<a class="jxr_linenumber" name="222" href="#222">222</a>         File execWarJar = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName );
-<a class="jxr_linenumber" name="223" href="#223">223</a> 
-<a class="jxr_linenumber" name="224" href="#224">224</a>         FileOutputStream execWarJarOutputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="225" href="#225">225</a>         ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="226" href="#226">226</a>         File tmpPropertiesFile = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="227" href="#227">227</a>         File tmpManifestFile = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="228" href="#228">228</a>         FileOutputStream tmpPropertiesFileOutputStream = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="229" href="#229">229</a>         PrintWriter tmpManifestWriter = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="162" href="#162">162</a> 
+<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> <em class="jxr_javadoccomment">     * the type to use for the attached/generated artifact</em>
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="166" href="#166">166</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="167" href="#167">167</a>     <strong class="jxr_keyword">protected</strong> String attachArtifactClassifierType;
+<a class="jxr_linenumber" name="168" href="#168">168</a> 
+<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> <em class="jxr_javadoccomment">     * to enable naming when starting tomcat</em>
+<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="172" href="#172">172</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="173" href="#173">173</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> enableNaming;
+<a class="jxr_linenumber" name="174" href="#174">174</a> 
+<a class="jxr_linenumber" name="175" href="#175">175</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="176" href="#176">176</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="177" href="#177">177</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="178" href="#178">178</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="179" href="#179">179</a>                required = <strong class="jxr_keyword">true</strong>)
+<a class="jxr_linenumber" name="180" href="#180">180</a>     <strong class="jxr_keyword">protected</strong> String accessLogValveFormat;
+<a class="jxr_linenumber" name="181" href="#181">181</a> 
+<a class="jxr_linenumber" name="182" href="#182">182</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="183" href="#183">183</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="184" href="#184">184</a> <em class="jxr_javadoccomment">     * &lt;b&gt;Those dependencies will be in root classloader.&lt;/b&gt;</em>
+<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="186" href="#186">186</a>     @Parameter
+<a class="jxr_linenumber" name="187" href="#187">187</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraDependency&gt; extraDependencies;
+<a class="jxr_linenumber" name="188" href="#188">188</a> 
+<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> <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="191" href="#191">191</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="192" href="#192">192</a>     @Parameter
+<a class="jxr_linenumber" name="193" href="#193">193</a>     <strong class="jxr_keyword">protected</strong> List&lt;ExtraResource&gt; extraResources;
+<a class="jxr_linenumber" name="194" href="#194">194</a> 
+<a class="jxr_linenumber" name="195" href="#195">195</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_javadoccomment">     * Main class to use for starting the standalone jar.</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="198" href="#198">198</a>     @Parameter(property = <span class="jxr_string">"maven.tomcat.exec.war.mainClass"</span>,
+<a class="jxr_linenumber" name="199" href="#199">199</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="200" href="#200">200</a>     <strong class="jxr_keyword">protected</strong> String mainClass;
+<a class="jxr_linenumber" name="201" href="#201">201</a> 
+<a class="jxr_linenumber" name="202" href="#202">202</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="203" href="#203">203</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="204" href="#204">204</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="205" href="#205">205</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="206" href="#206">206</a>     <strong class="jxr_keyword">protected</strong> String connectorHttpProtocol;
+<a class="jxr_linenumber" name="207" href="#207">207</a> 
+<a class="jxr_linenumber" name="208" href="#208">208</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_javadoccomment">     * configure a default http port for the standalone jar</em>
+<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_javadoccomment">     * @since 2.2</em>
+<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="213" href="#213">213</a>     @Parameter( property = <span class="jxr_string">"maven.tomcat.exec.war.httpPort"</span> )
+<a class="jxr_linenumber" name="214" href="#214">214</a>     <strong class="jxr_keyword">protected</strong> String httpPort;
+<a class="jxr_linenumber" name="215" href="#215">215</a> 
+<a class="jxr_linenumber" name="216" href="#216">216</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> execute()
+<a class="jxr_linenumber" name="217" href="#217">217</a>         <strong class="jxr_keyword">throws</strong> MojoExecutionException, MojoFailureException
+<a class="jxr_linenumber" name="218" href="#218">218</a>     {
+<a class="jxr_linenumber" name="219" href="#219">219</a>         <strong class="jxr_keyword">if</strong> ( <strong class="jxr_keyword">this</strong>.skip )
+<a class="jxr_linenumber" name="220" href="#220">220</a>         {
+<a class="jxr_linenumber" name="221" href="#221">221</a>             getLog().info( <span class="jxr_string">"skip execution"</span> );
+<a class="jxr_linenumber" name="222" href="#222">222</a>             <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="223" href="#223">223</a>         }
+<a class="jxr_linenumber" name="224" href="#224">224</a>         <em class="jxr_comment">//project.addAttachedArtifact(  );</em>
+<a class="jxr_linenumber" name="225" href="#225">225</a>         File warExecFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName );
+<a class="jxr_linenumber" name="226" href="#226">226</a>         <strong class="jxr_keyword">if</strong> ( warExecFile.exists() )
+<a class="jxr_linenumber" name="227" href="#227">227</a>         {
+<a class="jxr_linenumber" name="228" href="#228">228</a>             warExecFile.delete();
+<a class="jxr_linenumber" name="229" href="#229">229</a>         }
 <a class="jxr_linenumber" name="230" href="#230">230</a> 
-<a class="jxr_linenumber" name="231" href="#231">231</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="232" href="#232">232</a>         {
-<a class="jxr_linenumber" name="233" href="#233">233</a> 
-<a class="jxr_linenumber" name="234" href="#234">234</a>             tmpPropertiesFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.properties"</span> );
-<a class="jxr_linenumber" name="235" href="#235">235</a>             <strong class="jxr_keyword">if</strong> ( tmpPropertiesFile.exists() )
-<a class="jxr_linenumber" name="236" href="#236">236</a>             {
-<a class="jxr_linenumber" name="237" href="#237">237</a>                 tmpPropertiesFile.delete();
-<a class="jxr_linenumber" name="238" href="#238">238</a>             }
-<a class="jxr_linenumber" name="239" href="#239">239</a>             tmpPropertiesFile.getParentFile().mkdirs();
-<a class="jxr_linenumber" name="240" href="#240">240</a> 
-<a class="jxr_linenumber" name="241" href="#241">241</a>             tmpManifestFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.manifest"</span> );
-<a class="jxr_linenumber" name="242" href="#242">242</a>             <strong class="jxr_keyword">if</strong> ( tmpManifestFile.exists() )
-<a class="jxr_linenumber" name="243" href="#243">243</a>             {
-<a class="jxr_linenumber" name="244" href="#244">244</a>                 tmpManifestFile.delete();
-<a class="jxr_linenumber" name="245" href="#245">245</a>             }
-<a class="jxr_linenumber" name="246" href="#246">246</a>             tmpPropertiesFileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpPropertiesFile );
-<a class="jxr_linenumber" name="247" href="#247">247</a>             execWarJar.getParentFile().mkdirs();
-<a class="jxr_linenumber" name="248" href="#248">248</a>             execWarJar.createNewFile();
-<a class="jxr_linenumber" name="249" href="#249">249</a>             execWarJarOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( execWarJar );
-<a class="jxr_linenumber" name="250" href="#250">250</a> 
-<a class="jxr_linenumber" name="251" href="#251">251</a>             tmpManifestWriter = <strong class="jxr_keyword">new</strong> PrintWriter( tmpManifestFile );
-<a class="jxr_linenumber" name="252" href="#252">252</a> 
-<a class="jxr_linenumber" name="253" href="#253">253</a>             <em class="jxr_comment">// store :</em>
-<a class="jxr_linenumber" name="254" href="#254">254</a>             /<em class="jxr_comment">/*<em class="jxr_comment"> wars in the root: foo.war</em></em>
-<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_comment">            //* tomcat jars</em>
-<a class="jxr_linenumber" name="256" href="#256">256</a> <em class="jxr_comment">            //* file tomcat.standalone.properties with possible values :</em>
-<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_comment">            //   * useServerXml=true/false to use directly the one provided</em>
-<a class="jxr_linenumber" name="258" href="#258">258</a> <em class="jxr_comment">            //   * enableNaming=true/false</em>
-<a class="jxr_linenumber" name="259" href="#259">259</a> <em class="jxr_comment">            //   * wars=foo.war|contextpath;bar.war  ( |contextpath is optionnal if empty use the war name )</em>
-<a class="jxr_linenumber" name="260" href="#260">260</a> <em class="jxr_comment">            //   * accessLogValveFormat=</em>
-<a class="jxr_linenumber" name="261" href="#261">261</a> <em class="jxr_comment">            //   * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em>
-<a class="jxr_linenumber" name="262" href="#262">262</a> <em class="jxr_comment">            //* optionnal: conf/ with usual tomcat configuration files</em>
-<a class="jxr_linenumber" name="263" href="#263">263</a> <em class="jxr_comment">            //* MANIFEST with Main-Class</em>
-<a class="jxr_linenumber" name="264" href="#264">264</a> 
-<a class="jxr_linenumber" name="265" href="#265">265</a> <em class="jxr_comment">            Properties properties = new Properties();</em>
-<a class="jxr_linenumber" name="266" href="#266">266</a> 
-<a class="jxr_linenumber" name="267" href="#267">267</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,</em>
-<a class="jxr_linenumber" name="268" href="#268">268</a> <em class="jxr_comment">                            Long.toString( System.currentTimeMillis() ) );</em>
-<a class="jxr_linenumber" name="269" href="#269">269</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );</em>
-<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat );</em>
-<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol );</em>
-<a class="jxr_linenumber" name="272" href="#272">272</a> 
-<a class="jxr_linenumber" name="273" href="#273">273</a> <em class="jxr_comment">            os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR,</em>
-<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_comment">                                                                       execWarJarOutputStream );</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a>         File execWarJar = <strong class="jxr_keyword">new</strong> File( buildDirectory, finalName );
+<a class="jxr_linenumber" name="232" href="#232">232</a> 
+<a class="jxr_linenumber" name="233" href="#233">233</a>         FileOutputStream execWarJarOutputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="234" href="#234">234</a>         ArchiveOutputStream os = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="235" href="#235">235</a>         File tmpPropertiesFile = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="236" href="#236">236</a>         File tmpManifestFile = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="237" href="#237">237</a>         FileOutputStream tmpPropertiesFileOutputStream = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="238" href="#238">238</a>         PrintWriter tmpManifestWriter = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="239" href="#239">239</a> 
+<a class="jxr_linenumber" name="240" href="#240">240</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="241" href="#241">241</a>         {
+<a class="jxr_linenumber" name="242" href="#242">242</a> 
+<a class="jxr_linenumber" name="243" href="#243">243</a>             tmpPropertiesFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.properties"</span> );
+<a class="jxr_linenumber" name="244" href="#244">244</a>             <strong class="jxr_keyword">if</strong> ( tmpPropertiesFile.exists() )
+<a class="jxr_linenumber" name="245" href="#245">245</a>             {
+<a class="jxr_linenumber" name="246" href="#246">246</a>                 tmpPropertiesFile.delete();
+<a class="jxr_linenumber" name="247" href="#247">247</a>             }
+<a class="jxr_linenumber" name="248" href="#248">248</a>             tmpPropertiesFile.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="249" href="#249">249</a> 
+<a class="jxr_linenumber" name="250" href="#250">250</a>             tmpManifestFile = <strong class="jxr_keyword">new</strong> File( buildDirectory, <span class="jxr_string">"war-exec.manifest"</span> );
+<a class="jxr_linenumber" name="251" href="#251">251</a>             <strong class="jxr_keyword">if</strong> ( tmpManifestFile.exists() )
+<a class="jxr_linenumber" name="252" href="#252">252</a>             {
+<a class="jxr_linenumber" name="253" href="#253">253</a>                 tmpManifestFile.delete();
+<a class="jxr_linenumber" name="254" href="#254">254</a>             }
+<a class="jxr_linenumber" name="255" href="#255">255</a>             tmpPropertiesFileOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( tmpPropertiesFile );
+<a class="jxr_linenumber" name="256" href="#256">256</a>             execWarJar.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="257" href="#257">257</a>             execWarJar.createNewFile();
+<a class="jxr_linenumber" name="258" href="#258">258</a>             execWarJarOutputStream = <strong class="jxr_keyword">new</strong> FileOutputStream( execWarJar );
+<a class="jxr_linenumber" name="259" href="#259">259</a> 
+<a class="jxr_linenumber" name="260" href="#260">260</a>             tmpManifestWriter = <strong class="jxr_keyword">new</strong> PrintWriter( tmpManifestFile );
+<a class="jxr_linenumber" name="261" href="#261">261</a> 
+<a class="jxr_linenumber" name="262" href="#262">262</a>             <em class="jxr_comment">// store :</em>
+<a class="jxr_linenumber" name="263" href="#263">263</a>             /<em class="jxr_comment">/*<em class="jxr_comment"> wars in the root: foo.war</em></em>
+<a class="jxr_linenumber" name="264" href="#264">264</a> <em class="jxr_comment">            //* tomcat jars</em>
+<a class="jxr_linenumber" name="265" href="#265">265</a> <em class="jxr_comment">            //* file tomcat.standalone.properties with possible values :</em>
+<a class="jxr_linenumber" name="266" href="#266">266</a> <em class="jxr_comment">            //   * useServerXml=true/false to use directly the one provided</em>
+<a class="jxr_linenumber" name="267" href="#267">267</a> <em class="jxr_comment">            //   * enableNaming=true/false</em>
+<a class="jxr_linenumber" name="268" href="#268">268</a> <em class="jxr_comment">            //   * wars=foo.war|contextpath;bar.war  ( |contextpath is optionnal if empty use the war name )</em>
+<a class="jxr_linenumber" name="269" href="#269">269</a> <em class="jxr_comment">            //   * accessLogValveFormat=</em>
+<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment">            //   * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol</em>
+<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment">            //* optionnal: conf/ with usual tomcat configuration files</em>
+<a class="jxr_linenumber" name="272" href="#272">272</a> <em class="jxr_comment">            //* MANIFEST with Main-Class</em>
+<a class="jxr_linenumber" name="273" href="#273">273</a> 
+<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_comment">            Properties properties = new Properties();</em>
 <a class="jxr_linenumber" name="275" href="#275">275</a> 
-<a class="jxr_linenumber" name="276" href="#276">276</a> <em class="jxr_comment">            if ( "war".equals( project.getPackaging() ) )</em>
-<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="278" href="#278">278</a> 
-<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">                os.putArchiveEntry( new JarArchiveEntry( StringUtils.removeStart( path, "/" ) + ".war" ) );</em>
-<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_comment">                IOUtils.copy( new FileInputStream( projectArtifact.getFile() ), os );</em>
-<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_comment">                os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="282" href="#282">282</a> 
-<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.WARS_KEY, StringUtils.removeStart( path, "/" ) + ".war|" + path );</em>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">            else if ( warRunDependencies != null &amp;&amp; !warRunDependencies.isEmpty() )</em>
-<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_comment">                for ( WarRunDependency warRunDependency : warRunDependencies )</em>
-<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_comment">                {</em>
-<a class="jxr_linenumber" name="289" href="#289">289</a> <em class="jxr_comment">                    if ( warRunDependency.dependency != null )</em>
-<a class="jxr_linenumber" name="290" href="#290">290</a> <em class="jxr_comment">                    {</em>
-<a class="jxr_linenumber" name="291" href="#291">291</a> <em class="jxr_comment">                        Dependency dependency = warRunDependency.dependency;</em>
-<a class="jxr_linenumber" name="292" href="#292">292</a> <em class="jxr_comment">                        Artifact artifact = artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),</em>
-<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_comment">                                                                                          dependency.getArtifactId(),</em>
-<a class="jxr_linenumber" name="294" href="#294">294</a> <em class="jxr_comment">                                                                                          dependency.getVersion(),</em>
-<a class="jxr_linenumber" name="295" href="#295">295</a> <em class="jxr_comment">                                                                                          dependency.getType(),</em>
-<a class="jxr_linenumber" name="296" href="#296">296</a> <em class="jxr_comment">                                                                                          dependency.getClassifier() );</em>
-<a class="jxr_linenumber" name="297" href="#297">297</a> 
-<a class="jxr_linenumber" name="298" href="#298">298</a> <em class="jxr_comment">                        artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
-<a class="jxr_linenumber" name="299" href="#299">299</a> 
-<a class="jxr_linenumber" name="300" href="#300">300</a> <em class="jxr_comment">                        File warFileToBundle = new File( resolvePluginWorkDir(), artifact.getFile().getName() );</em>
-<a class="jxr_linenumber" name="301" href="#301">301</a> <em class="jxr_comment">                        FileUtils.copyFile( artifact.getFile(), warFileToBundle );</em>
-<a class="jxr_linenumber" name="302" href="#302">302</a> 
-<a class="jxr_linenumber" name="303" href="#303">303</a> <em class="jxr_comment">                        if ( warRunDependency.contextXml != null )</em>
-<a class="jxr_linenumber" name="304" href="#304">304</a> <em class="jxr_comment">                        {</em>
-<a class="jxr_linenumber" name="305" href="#305">305</a> <em class="jxr_comment">                            warFileToBundle = addContextXmlToWar( warRunDependency.contextXml, warFileToBundle );</em>
-<a class="jxr_linenumber" name="306" href="#306">306</a> <em class="jxr_comment">                        }</em>
-<a class="jxr_linenumber" name="307" href="#307">307</a> <em class="jxr_comment">                        final String warFileName = artifact.getFile().getName();</em>
-<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( warFileName ) );</em>
-<a class="jxr_linenumber" name="309" href="#309">309</a> <em class="jxr_comment">                        IOUtils.copy( new FileInputStream( warFileToBundle ), os );</em>
-<a class="jxr_linenumber" name="310" href="#310">310</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="311" href="#311">311</a> <em class="jxr_comment">                        String propertyWarValue = properties.getProperty( Tomcat7Runner.WARS_KEY );</em>
-<a class="jxr_linenumber" name="312" href="#312">312</a> <em class="jxr_comment">                        String contextPath =</em>
-<a class="jxr_linenumber" name="313" href="#313">313</a> <em class="jxr_comment">                            StringUtils.isEmpty( warRunDependency.contextPath ) ? "/" : warRunDependency.contextPath;</em>
-<a class="jxr_linenumber" name="314" href="#314">314</a> <em class="jxr_comment">                        if ( propertyWarValue != null )</em>
-<a class="jxr_linenumber" name="315" href="#315">315</a> <em class="jxr_comment">                        {</em>
-<a class="jxr_linenumber" name="316" href="#316">316</a> <em class="jxr_comment">                            properties.put( Tomcat7Runner.WARS_KEY,</em>
-<a class="jxr_linenumber" name="317" href="#317">317</a> <em class="jxr_comment">                                            propertyWarValue + ";" + warFileName + "|" + contextPath );</em>
-<a class="jxr_linenumber" name="318" href="#318">318</a> <em class="jxr_comment">                        }</em>
-<a class="jxr_linenumber" name="319" href="#319">319</a> <em class="jxr_comment">                        else</em>
-<a class="jxr_linenumber" name="320" href="#320">320</a> <em class="jxr_comment">                        {</em>
-<a class="jxr_linenumber" name="321" href="#321">321</a> <em class="jxr_comment">                            properties.put( Tomcat7Runner.WARS_KEY, warFileName + "|" + contextPath );</em>
-<a class="jxr_linenumber" name="322" href="#322">322</a> <em class="jxr_comment">                        }</em>
-<a class="jxr_linenumber" name="323" href="#323">323</a> <em class="jxr_comment">                    }</em>
-<a class="jxr_linenumber" name="324" href="#324">324</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="325" href="#325">325</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="326" href="#326">326</a> 
-<a class="jxr_linenumber" name="327" href="#327">327</a> <em class="jxr_comment">            if ( serverXml != null &amp;&amp; serverXml.exists() )</em>
-<a class="jxr_linenumber" name="328" href="#328">328</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="329" href="#329">329</a> <em class="jxr_comment">                os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) );</em>
-<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">                IOUtils.copy( new FileInputStream( serverXml ), os );</em>
-<a class="jxr_linenumber" name="331" href="#331">331</a> <em class="jxr_comment">                os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="332" href="#332">332</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() );</em>
-<a class="jxr_linenumber" name="333" href="#333">333</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="334" href="#334">334</a> <em class="jxr_comment">            else</em>
-<a class="jxr_linenumber" name="335" href="#335">335</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="336" href="#336">336</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() );</em>
-<a class="jxr_linenumber" name="337" href="#337">337</a> <em class="jxr_comment">            }</em>
-<a class="jxr_linenumber" name="338" href="#338">338</a> 
-<a class="jxr_linenumber" name="339" href="#339">339</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) );</em>
-<a class="jxr_linenumber" name="340" href="#340">340</a> <em class="jxr_comment">            IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os );</em>
-<a class="jxr_linenumber" name="341" href="#341">341</a> <em class="jxr_comment">            os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="342" href="#342">342</a> 
-<a class="jxr_linenumber" name="343" href="#343">343</a> <em class="jxr_comment">            properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" );</em>
-<a class="jxr_linenumber" name="344" href="#344">344</a> 
-<a class="jxr_linenumber" name="345" href="#345">345</a> <em class="jxr_comment">            tmpPropertiesFileOutputStream.flush();</em>
-<a class="jxr_linenumber" name="346" href="#346">346</a> <em class="jxr_comment">            tmpPropertiesFileOutputStream.close();</em>
-<a class="jxr_linenumber" name="347" href="#347">347</a> 
-<a class="jxr_linenumber" name="348" href="#348">348</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) );</em>
-<a class="jxr_linenumber" name="349" href="#349">349</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os );</em>
-<a class="jxr_linenumber" name="350" href="#350">350</a> <em class="jxr_comment">            os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="351" href="#351">351</a> 
-<a class="jxr_linenumber" name="352" href="#352">352</a> <em class="jxr_comment">            // add tomcat classes</em>
-<a class="jxr_linenumber" name="353" href="#353">353</a> <em class="jxr_comment">            for ( Artifact pluginArtifact : pluginArtifacts )</em>
-<a class="jxr_linenumber" name="354" href="#354">354</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_comment">                if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(</em>
-<a class="jxr_linenumber" name="356" href="#356">356</a> <em class="jxr_comment">                    "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(</em>
-<a class="jxr_linenumber" name="357" href="#357">357</a> <em class="jxr_comment">                    "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",</em>
-<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_comment">                                                                                                          pluginArtifact.getArtifactId() )</em>
-<a class="jxr_linenumber" name="359" href="#359">359</a> <em class="jxr_comment">                    || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) )</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">                    JarFile jarFile = new JarFile( pluginArtifact.getFile() );</em>
-<a class="jxr_linenumber" name="362" href="#362">362</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
-<a class="jxr_linenumber" name="363" href="#363">363</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="276" href="#276">276</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,</em>
+<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment">                            Long.toString( System.currentTimeMillis() ) );</em>
+<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );</em>
+<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat );</em>
+<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_comment">            properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol );</em>
+<a class="jxr_linenumber" name="281" href="#281">281</a> 
+<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment">            if ( httpPort != null )</em>
+<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.HTTP_PORT_KEY, httpPort );</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="286" href="#286">286</a> 
+<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_comment">            os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR,</em>
+<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_comment">                                                                       execWarJarOutputStream );</em>
+<a class="jxr_linenumber" name="289" href="#289">289</a> 
+<a class="jxr_linenumber" name="290" href="#290">290</a> <em class="jxr_comment">            if ( "war".equals( project.getPackaging() ) )</em>
+<a class="jxr_linenumber" name="291" href="#291">291</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="292" href="#292">292</a> 
+<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_comment">                os.putArchiveEntry( new JarArchiveEntry( StringUtils.removeStart( path, "/" ) + ".war" ) );</em>
+<a class="jxr_linenumber" name="294" href="#294">294</a> <em class="jxr_comment">                IOUtils.copy( new FileInputStream( projectArtifact.getFile() ), os );</em>
+<a class="jxr_linenumber" name="295" href="#295">295</a> <em class="jxr_comment">                os.closeArchiveEntry();</em>
+<a class="jxr_linenumber" name="296" href="#296">296</a> 
+<a class="jxr_linenumber" name="297" href="#297">297</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.WARS_KEY, StringUtils.removeStart( path, "/" ) + ".war|" + path );</em>
+<a class="jxr_linenumber" name="298" href="#298">298</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="299" href="#299">299</a> <em class="jxr_comment">            else if ( warRunDependencies != null &amp;&amp; !warRunDependencies.isEmpty() )</em>
+<a class="jxr_linenumber" name="300" href="#300">300</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="301" href="#301">301</a> <em class="jxr_comment">                for ( WarRunDependency warRunDependency : warRunDependencies )</em>
+<a class="jxr_linenumber" name="302" href="#302">302</a> <em class="jxr_comment">                {</em>
+<a class="jxr_linenumber" name="303" href="#303">303</a> <em class="jxr_comment">                    if ( warRunDependency.dependency != null )</em>
+<a class="jxr_linenumber" name="304" href="#304">304</a> <em class="jxr_comment">                    {</em>
+<a class="jxr_linenumber" name="305" href="#305">305</a> <em class="jxr_comment">                        Dependency dependency = warRunDependency.dependency;</em>
+<a class="jxr_linenumber" name="306" href="#306">306</a> <em class="jxr_comment">                        Artifact artifact = artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),</em>
+<a class="jxr_linenumber" name="307" href="#307">307</a> <em class="jxr_comment">                                                                                          dependency.getArtifactId(),</em>
+<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_comment">                                                                                          dependency.getVersion(),</em>
+<a class="jxr_linenumber" name="309" href="#309">309</a> <em class="jxr_comment">                                                                                          dependency.getType(),</em>
+<a class="jxr_linenumber" name="310" href="#310">310</a> <em class="jxr_comment">                                                                                          dependency.getClassifier() );</em>
+<a class="jxr_linenumber" name="311" href="#311">311</a> 
+<a class="jxr_linenumber" name="312" href="#312">312</a> <em class="jxr_comment">                        artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
+<a class="jxr_linenumber" name="313" href="#313">313</a> 
+<a class="jxr_linenumber" name="314" href="#314">314</a> <em class="jxr_comment">                        File warFileToBundle = new File( resolvePluginWorkDir(), artifact.getFile().getName() );</em>
+<a class="jxr_linenumber" name="315" href="#315">315</a> <em class="jxr_comment">                        FileUtils.copyFile( artifact.getFile(), warFileToBundle );</em>
+<a class="jxr_linenumber" name="316" href="#316">316</a> 
+<a class="jxr_linenumber" name="317" href="#317">317</a> <em class="jxr_comment">                        if ( warRunDependency.contextXml != null )</em>
+<a class="jxr_linenumber" name="318" href="#318">318</a> <em class="jxr_comment">                        {</em>
+<a class="jxr_linenumber" name="319" href="#319">319</a> <em class="jxr_comment">                            warFileToBundle = addContextXmlToWar( warRunDependency.contextXml, warFileToBundle );</em>
+<a class="jxr_linenumber" name="320" href="#320">320</a> <em class="jxr_comment">                        }</em>
+<a class="jxr_linenumber" name="321" href="#321">321</a> <em class="jxr_comment">                        final String warFileName = artifact.getFile().getName();</em>
+<a class="jxr_linenumber" name="322" href="#322">322</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( warFileName ) );</em>
+<a class="jxr_linenumber" name="323" href="#323">323</a> <em class="jxr_comment">                        IOUtils.copy( new FileInputStream( warFileToBundle ), os );</em>
+<a class="jxr_linenumber" name="324" href="#324">324</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
+<a class="jxr_linenumber" name="325" href="#325">325</a> <em class="jxr_comment">                        String propertyWarValue = properties.getProperty( Tomcat7Runner.WARS_KEY );</em>
+<a class="jxr_linenumber" name="326" href="#326">326</a> <em class="jxr_comment">                        String contextPath =</em>
+<a class="jxr_linenumber" name="327" href="#327">327</a> <em class="jxr_comment">                            StringUtils.isEmpty( warRunDependency.contextPath ) ? "/" : warRunDependency.contextPath;</em>
+<a class="jxr_linenumber" name="328" href="#328">328</a> <em class="jxr_comment">                        if ( propertyWarValue != null )</em>
+<a class="jxr_linenumber" name="329" href="#329">329</a> <em class="jxr_comment">                        {</em>
+<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">                            properties.put( Tomcat7Runner.WARS_KEY,</em>
+<a class="jxr_linenumber" name="331" href="#331">331</a> <em class="jxr_comment">                                            propertyWarValue + ";" + warFileName + "|" + contextPath );</em>
+<a class="jxr_linenumber" name="332" href="#332">332</a> <em class="jxr_comment">                        }</em>
+<a class="jxr_linenumber" name="333" href="#333">333</a> <em class="jxr_comment">                        else</em>
+<a class="jxr_linenumber" name="334" href="#334">334</a> <em class="jxr_comment">                        {</em>
+<a class="jxr_linenumber" name="335" href="#335">335</a> <em class="jxr_comment">                            properties.put( Tomcat7Runner.WARS_KEY, warFileName + "|" + contextPath );</em>
+<a class="jxr_linenumber" name="336" href="#336">336</a> <em class="jxr_comment">                        }</em>
+<a class="jxr_linenumber" name="337" href="#337">337</a> <em class="jxr_comment">                    }</em>
+<a class="jxr_linenumber" name="338" href="#338">338</a> <em class="jxr_comment">                }</em>
+<a class="jxr_linenumber" name="339" href="#339">339</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="340" href="#340">340</a> 
+<a class="jxr_linenumber" name="341" href="#341">341</a> <em class="jxr_comment">            if ( serverXml != null &amp;&amp; serverXml.exists() )</em>
+<a class="jxr_linenumber" name="342" href="#342">342</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="343" href="#343">343</a> <em class="jxr_comment">                os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) );</em>
+<a class="jxr_linenumber" name="344" href="#344">344</a> <em class="jxr_comment">                IOUtils.copy( new FileInputStream( serverXml ), os );</em>
+<a class="jxr_linenumber" name="345" href="#345">345</a> <em class="jxr_comment">                os.closeArchiveEntry();</em>
+<a class="jxr_linenumber" name="346" href="#346">346</a> <em class="jxr_comment">                properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() );</em>
+<a class="jxr_linenumber" name="347" href="#347">347</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="348" href="#348">348</a> <em class="jxr_comment">            else</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">                properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() );</em>
+<a class="jxr_linenumber" name="351" href="#351">351</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="352" href="#352">352</a> 
+<a class="jxr_linenumber" name="353" href="#353">353</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) );</em>
+<a class="jxr_linenumber" name="354" href="#354">354</a> <em class="jxr_comment">            IOUtils.copy( getClass().getResourceAsStream( "/conf/web.xml" ), os );</em>
+<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_comment">            os.closeArchiveEntry();</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">            properties.store( tmpPropertiesFileOutputStream, "created by Apache Tomcat Maven plugin" );</em>
+<a class="jxr_linenumber" name="358" href="#358">358</a> 
+<a class="jxr_linenumber" name="359" href="#359">359</a> <em class="jxr_comment">            tmpPropertiesFileOutputStream.flush();</em>
+<a class="jxr_linenumber" name="360" href="#360">360</a> <em class="jxr_comment">            tmpPropertiesFileOutputStream.close();</em>
+<a class="jxr_linenumber" name="361" href="#361">361</a> 
+<a class="jxr_linenumber" name="362" href="#362">362</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) );</em>
+<a class="jxr_linenumber" name="363" href="#363">363</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os );</em>
+<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">            os.closeArchiveEntry();</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">            // add extra dependencies</em>
-<a class="jxr_linenumber" name="367" href="#367">367</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">            // add tomcat classes</em>
+<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">            for ( Artifact pluginArtifact : pluginArtifacts )</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">                for ( Dependency dependency : extraDependencies )</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> <em class="jxr_comment">                    // String groupId, String artifactId, String version, String scope, String type</em>
-<a class="jxr_linenumber" name="372" href="#372">372</a> <em class="jxr_comment">                    Artifact artifact =</em>
-<a class="jxr_linenumber" name="373" href="#373">373</a> <em class="jxr_comment">                        artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em>
-<a class="jxr_linenumber" name="374" href="#374">374</a> <em class="jxr_comment">                                                        dependency.getVersion(), dependency.getScope(),</em>
-<a class="jxr_linenumber" name="375" href="#375">375</a> <em class="jxr_comment">                                                        dependency.getType() );</em>
-<a class="jxr_linenumber" name="376" href="#376">376</a> 
-<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_comment">                    artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
-<a class="jxr_linenumber" name="378" href="#378">378</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( artifact.getFile() );</em>
-<a class="jxr_linenumber" name="379" href="#379">379</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
-<a class="jxr_linenumber" name="380" href="#380">380</a> <em class="jxr_comment">                }</em>
-<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_comment">            }</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">            Manifest manifest = new Manifest();</em>
-<a class="jxr_linenumber" name="384" href="#384">384</a> 
-<a class="jxr_linenumber" name="385" href="#385">385</a> <em class="jxr_comment">            Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em>
-<a class="jxr_linenumber" name="386" href="#386">386</a> <em class="jxr_comment">            mainClassAtt.setName( "Main-Class" );</em>
-<a class="jxr_linenumber" name="387" href="#387">387</a> <em class="jxr_comment">            mainClassAtt.setValue( mainClass );</em>
-<a class="jxr_linenumber" name="388" href="#388">388</a> <em class="jxr_comment">            manifest.addConfiguredAttribute( mainClassAtt );</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.write( tmpManifestWriter );</em>
-<a class="jxr_linenumber" name="391" href="#391">391</a> <em class="jxr_comment">            tmpManifestWriter.flush();</em>
-<a class="jxr_linenumber" name="392" href="#392">392</a> <em class="jxr_comment">            tmpManifestWriter.close();</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">            os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em>
-<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em>
-<a class="jxr_linenumber" name="396" href="#396">396</a> <em class="jxr_comment">            os.closeArchiveEntry();</em>
-<a class="jxr_linenumber" name="397" href="#397">397</a> 
-<a class="jxr_linenumber" name="398" href="#398">398</a> <em class="jxr_comment">            if ( attachArtifact )</em>
-<a class="jxr_linenumber" name="399" href="#399">399</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="400" href="#400">400</a> <em class="jxr_comment">                //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em>
-<a class="jxr_linenumber" name="401" href="#401">401</a> <em class="jxr_comment">                projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em>
-<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_comment">                                              execWarJar );</em>
-<a class="jxr_linenumber" name="403" href="#403">403</a> <em class="jxr_comment">            }</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 ( extraResources != null )</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">                for ( ExtraResource extraResource : extraResources )</em>
-<a class="jxr_linenumber" name="408" href="#408">408</a> <em class="jxr_comment">                {</em>
-<a class="jxr_linenumber" name="409" href="#409">409</a> 
-<a class="jxr_linenumber" name="410" href="#410">410</a> <em class="jxr_comment">                    DirectoryScanner directoryScanner = new DirectoryScanner();</em>
-<a class="jxr_linenumber" name="411" href="#411">411</a> <em class="jxr_comment">                    directoryScanner.setBasedir( extraResource.getDirectory() );</em>
-<a class="jxr_linenumber" name="412" href="#412">412</a> <em class="jxr_comment">                    directoryScanner.addDefaultExcludes();</em>
-<a class="jxr_linenumber" name="413" href="#413">413</a> <em class="jxr_comment">                    directoryScanner.setExcludes( toStringArray( extraResource.getExcludes() ) );</em>
-<a class="jxr_linenumber" name="414" href="#414">414</a> <em class="jxr_comment">                    directoryScanner.setIncludes( toStringArray( extraResource.getIncludes() ) );</em>
-<a class="jxr_linenumber" name="415" href="#415">415</a> <em class="jxr_comment">                    directoryScanner.scan();</em>
-<a class="jxr_linenumber" name="416" href="#416">416</a> <em class="jxr_comment">                    for ( String includeFile : directoryScanner.getIncludedFiles() )</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">                        getLog().debug( "include file:" + includeFile );</em>
-<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">                        os.putArchiveEntry( new JarArchiveEntry( includeFile ) );</em>
-<a class="jxr_linenumber" name="420" href="#420">420</a> <em class="jxr_comment">                        IOUtils.copy( new FileInputStream( new File( extraResource.getDirectory(), includeFile ) ),</em>
-<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_comment">                                      os );</em>
-<a class="jxr_linenumber" name="422" href="#422">422</a> <em class="jxr_comment">                        os.closeArchiveEntry();</em>
-<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">                }</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> 
-<a class="jxr_linenumber" name="427" href="#427">427</a> <em class="jxr_comment">            if ( tomcatConfigurationFilesDirectory != null &amp;&amp; tomcatConfigurationFilesDirectory.exists() )</em>
-<a class="jxr_linenumber" name="428" href="#428">428</a> <em class="jxr_comment">            {</em>
-<a class="jxr_linenumber" name="429" href="#429">429</a> <em class="jxr_comment">                // Because its the tomcat default dir for configs</em>
-<a class="jxr_linenumber" name="430" href="#430">430</a> <em class="jxr_comment">                String aConfigOutputDir = "conf/";</em>
-<a class="jxr_linenumber" name="431" href="#431">431</a> <em class="jxr_comment">                copyDirectoryContentIntoArchive( tomcatConfigurationFilesDirectory, aConfigOutputDir, os );</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">        }</em>
-<a class="jxr_linenumber" name="435" href="#435">435</a> <em class="jxr_comment">        catch ( ManifestException e )</em>
-<a class="jxr_linenumber" name="436" href="#436">436</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="437" href="#437">437</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="438" href="#438">438</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="439" href="#439">439</a> <em class="jxr_comment">        catch ( IOException e )</em>
-<a class="jxr_linenumber" name="440" href="#440">440</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="441" href="#441">441</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="442" href="#442">442</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="443" href="#443">443</a> <em class="jxr_comment">        catch ( ArchiveException e )</em>
-<a class="jxr_linenumber" name="444" href="#444">444</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="445" href="#445">445</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="446" href="#446">446</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="447" href="#447">447</a> <em class="jxr_comment">        catch ( ArtifactNotFoundException e )</em>
-<a class="jxr_linenumber" name="448" href="#448">448</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="449" href="#449">449</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</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">        catch ( ArtifactResolutionException e )</em>
-<a class="jxr_linenumber" name="452" href="#452">452</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="453" href="#453">453</a> <em class="jxr_comment">            throw new MojoExecutionException( e.getMessage(), e );</em>
-<a class="jxr_linenumber" name="454" href="#454">454</a> <em class="jxr_comment">        }</em>
-<a class="jxr_linenumber" name="455" href="#455">455</a> <em class="jxr_comment">        finally</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> <em class="jxr_comment">            IOUtils.closeQuietly( os );</em>
-<a class="jxr_linenumber" name="458" href="#458">458</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpManifestWriter );</em>
-<a class="jxr_linenumber" name="459" href="#459">459</a> <em class="jxr_comment">            IOUtils.closeQuietly( execWarJarOutputStream );</em>
-<a class="jxr_linenumber" name="460" href="#460">460</a> <em class="jxr_comment">            IOUtils.closeQuietly( tmpPropertiesFileOutputStream );</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">    }</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">    protected void copyDirectoryContentIntoArchive( File pSourceFolder, String pDestinationPath,</em>
-<a class="jxr_linenumber" name="465" href="#465">465</a> <em class="jxr_comment">                                                    ArchiveOutputStream pArchiveOutputSteam )</em>
-<a class="jxr_linenumber" name="466" href="#466">466</a> <em class="jxr_comment">        throws FileNotFoundException, IOException</em>
-<a class="jxr_linenumber" name="467" href="#467">467</a> <em class="jxr_comment">    {</em>
-<a class="jxr_linenumber" name="468" href="#468">468</a> 
-<a class="jxr_linenumber" name="469" href="#469">469</a> <em class="jxr_comment">        // Scan the directory</em>
-<a class="jxr_linenumber" name="470" href="#470">470</a> <em class="jxr_comment">        DirectoryScanner directoryScanner = new DirectoryScanner();</em>
-<a class="jxr_linenumber" name="471" href="#471">471</a> <em class="jxr_comment">        directoryScanner.setBasedir( pSourceFolder );</em>
-<a class="jxr_linenumber" name="472" href="#472">472</a> <em class="jxr_comment">        directoryScanner.addDefaultExcludes();</em>
-<a class="jxr_linenumber" name="473" href="#473">473</a> <em class="jxr_comment">        directoryScanner.scan();</em>
-<a class="jxr_linenumber" name="474" href="#474">474</a> 
-<a class="jxr_linenumber" name="475" href="#475">475</a> <em class="jxr_comment">        // Each File</em>
-<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">        for ( String aIncludeFileName : directoryScanner.getIncludedFiles() )</em>
-<a class="jxr_linenumber" name="477" href="#477">477</a> <em class="jxr_comment">        {</em>
-<a class="jxr_linenumber" name="478" href="#478">478</a> <em class="jxr_comment">            getLog().debug( "include configuration file : " + pDestinationPath + aIncludeFileName );</em>
-<a class="jxr_linenumber" name="479" href="#479">479</a> <em class="jxr_comment">            File aInputFile = new File( pSourceFolder, aIncludeFileName );</em>
-<a class="jxr_linenumber" name="480" href="#480">480</a> 
-<a class="jxr_linenumber" name="481" href="#481">481</a> <em class="jxr_comment">            FileInputStream aSourceFileInputStream = new FileInputStream( aInputFile );</em>
+<a class="jxr_linenumber" name="369" href="#369">369</a> <em class="jxr_comment">                if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(</em>
+<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_comment">                    "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(</em>
+<a class="jxr_linenumber" name="371" href="#371">371</a> <em class="jxr_comment">                    "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",</em>
+<a class="jxr_linenumber" name="372" href="#372">372</a> <em class="jxr_comment">                                                                                                          pluginArtifact.getArtifactId() )</em>
+<a class="jxr_linenumber" name="373" href="#373">373</a> <em class="jxr_comment">                    || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) )</em>
+<a class="jxr_linenumber" name="374" href="#374">374</a> <em class="jxr_comment">                {</em>
+<a class="jxr_linenumber" name="375" href="#375">375</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( pluginArtifact.getFile() );</em>
+<a class="jxr_linenumber" name="376" href="#376">376</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
+<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_comment">                }</em>
+<a class="jxr_linenumber" name="378" href="#378">378</a> <em class="jxr_comment">            }</em>
+<a class="jxr_linenumber" name="379" href="#379">379</a> 
+<a class="jxr_linenumber" name="380" href="#380">380</a> <em class="jxr_comment">            // add extra dependencies</em>
+<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_comment">            if ( extraDependencies != null &amp;&amp; !extraDependencies.isEmpty() )</em>
+<a class="jxr_linenumber" name="382" href="#382">382</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_comment">                for ( Dependency dependency : extraDependencies )</em>
+<a class="jxr_linenumber" name="384" href="#384">384</a> <em class="jxr_comment">                {</em>
+<a class="jxr_linenumber" name="385" href="#385">385</a> <em class="jxr_comment">                    // String groupId, String artifactId, String version, String scope, String type</em>
+<a class="jxr_linenumber" name="386" href="#386">386</a> <em class="jxr_comment">                    Artifact artifact =</em>
+<a class="jxr_linenumber" name="387" href="#387">387</a> <em class="jxr_comment">                        artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),</em>
+<a class="jxr_linenumber" name="388" href="#388">388</a> <em class="jxr_comment">                                                        dependency.getVersion(), dependency.getScope(),</em>
+<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_comment">                                                        dependency.getType() );</em>
+<a class="jxr_linenumber" name="390" href="#390">390</a> 
+<a class="jxr_linenumber" name="391" href="#391">391</a> <em class="jxr_comment">                    artifactResolver.resolve( artifact, this.remoteRepos, this.local );</em>
+<a class="jxr_linenumber" name="392" href="#392">392</a> <em class="jxr_comment">                    JarFile jarFile = new JarFile( artifact.getFile() );</em>
+<a class="jxr_linenumber" name="393" href="#393">393</a> <em class="jxr_comment">                    extractJarToArchive( jarFile, os );</em>
+<a class="jxr_linenumber" name="394" href="#394">394</a> <em class="jxr_comment">                }</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> 
+<a class="jxr_linenumber" name="397" href="#397">397</a> <em class="jxr_comment">            Manifest manifest = new Manifest();</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">            Manifest.Attribute mainClassAtt = new Manifest.Attribute();</em>
+<a class="jxr_linenumber" name="400" href="#400">400</a> <em class="jxr_comment">            mainClassAtt.setName( "Main-Class" );</em>
+<a class="jxr_linenumber" name="401" href="#401">401</a> <em class="jxr_comment">            mainClassAtt.setValue( mainClass );</em>
+<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_comment">            manifest.addConfiguredAttribute( mainClassAtt );</em>
+<a class="jxr_linenumber" name="403" href="#403">403</a> 
+<a class="jxr_linenumber" name="404" href="#404">404</a> <em class="jxr_comment">            manifest.write( tmpManifestWriter );</em>
+<a class="jxr_linenumber" name="405" href="#405">405</a> <em class="jxr_comment">            tmpManifestWriter.flush();</em>
+<a class="jxr_linenumber" name="406" href="#406">406</a> <em class="jxr_comment">            tmpManifestWriter.close();</em>
+<a class="jxr_linenumber" name="407" href="#407">407</a> 
+<a class="jxr_linenumber" name="408" href="#408">408</a> <em class="jxr_comment">            os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" ) );</em>
+<a class="jxr_linenumber" name="409" href="#409">409</a> <em class="jxr_comment">            IOUtils.copy( new FileInputStream( tmpManifestFile ), os );</em>
+<a class="jxr_linenumber" name="410" href="#410">410</a> <em class="jxr_comment">            os.closeArchiveEntry();</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 ( attachArtifact )</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">                //MavenProject project, String artifactType, String artifactClassifier, File artifactFile</em>
+<a class="jxr_linenumber" name="415" href="#415">415</a> <em class="jxr_comment">                projectHelper.attachArtifact( project, attachArtifactClassifierType, attachArtifactClassifier,</em>
+<a class="jxr_linenumber" name="416" href="#416">416</a> <em class="jxr_comment">                                              execWarJar );</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> 
+<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">            if ( extraResources != null )</em>
+<a class="jxr_linenumber" name="420" href="#420">420</a> <em class="jxr_comment">            {</em>
+<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_comment">                for ( ExtraResource extraResource : extraResources )</em>
+<a class="jxr_linenumber" name="422" href="#422">422</a> <em class="jxr_comment">                {</em>

[... 281 lines stripped ...]


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