You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by mi...@apache.org on 2016/02/08 20:06:48 UTC
svn commit: r979873 [21/32] - in
/websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST:
./ apidocs/ css/ examples/ fonts/ images/ images/profiles/ img/ js/
testapidocs/ xref-test/ xref/ xref/org/apache/maven/plugins/site/ xref...
Modified: websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/xref/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.html
==============================================================================
--- websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/xref/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.html (original)
+++ websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/xref/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.html Mon Feb 8 19:06:46 2016
@@ -165,714 +165,730 @@
<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> execute()
<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">if</strong> ( skipDeploy && isDeploy() )
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">if</strong> ( skip && isDeploy() )
<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> getLog().info( <span class="jxr_string">"maven.site.deploy.skip = true: Skipping site deployment"</span> );
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> getLog().info( <span class="jxr_string">"maven.site.skip = true: Skipping site deployment"</span> );
<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">return</strong>;
<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
<a class="jxr_linenumber" name="L165" href="#L165">165</a>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> deployTo( <strong class="jxr_keyword">new</strong> BugFixedRepository( getDeploySite().getId(), appendSlash( getDeploySite().getUrl() ) ) );
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> }
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment"> * Make sure the given url ends with a slash.</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em class="jxr_javadoccomment"> * @param url a String.</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment"> * @return if url already ends with '/' it is returned unchanged,</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment"> * otherwise a '/' character is appended.</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> String appendSlash( <strong class="jxr_keyword">final</strong> String url )
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">if</strong> ( url.endsWith( <span class="jxr_string">"/"</span> ) )
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> {
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">return</strong> url;
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> }
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> {
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">return</strong> url + <span class="jxr_string">"/"</span>;
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> }
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> }
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment"> * Detect if the mojo is staging or deploying.</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment"> * @return <code>true</code> if the mojo is for deploy and not staging (local or deploy)</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">boolean</strong> isDeploy();
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment"> * Get the top distribution management site url, used for module relative path calculations.</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment"> * This should be a top-level URL, ie above modules and locale sub-directories. Each deploy mojo</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> * can tweak algorithm to determine this top site by implementing determineTopDistributionManagementSiteUrl().</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment"> * @return the site for deployment</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment"> * @see #determineTopDistributionManagementSiteUrl()</em>
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">protected</strong> String getTopDistributionManagementSiteUrl()
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> {
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">if</strong> ( topDistributionManagementSiteUrl == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> {
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> topDistributionManagementSiteUrl = determineTopDistributionManagementSiteUrl();
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> getLog().debug( <span class="jxr_string">"top distributionManagement.site.url="</span> + topDistributionManagementSiteUrl
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> + <span class="jxr_string">", actual module relative path: "</span> + getDeployModuleDirectory() );
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> }
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">return</strong> topDistributionManagementSiteUrl;
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> }
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">if</strong> ( skipDeploy && isDeploy() )
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> {
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> getLog().info( <span class="jxr_string">"maven.site.deploy.skip = true: Skipping site deployment"</span> );
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> }
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> deployTo( <strong class="jxr_keyword">new</strong> BugFixedRepository( getDeploySite().getId(), appendSlash( getDeploySite().getUrl() ) ) );
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> }
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment"> * Make sure the given url ends with a slash.</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> * @param url a String.</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment"> * @return if url already ends with '/' it is returned unchanged,</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * otherwise a '/' character is appended.</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> String appendSlash( <strong class="jxr_keyword">final</strong> String url )
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">if</strong> ( url.endsWith( <span class="jxr_string">"/"</span> ) )
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> {
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">return</strong> url;
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> }
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> {
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">return</strong> url + <span class="jxr_string">"/"</span>;
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> }
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> }
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment"> * Detect if the mojo is staging or deploying.</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment"> * @return <code>true</code> if the mojo is for deploy and not staging (local or deploy)</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">boolean</strong> isDeploy();
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment"> * Get the top distribution management site url, used for module relative path calculations.</em>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <em class="jxr_javadoccomment"> * This should be a top-level URL, ie above modules and locale sub-directories. Each deploy mojo</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment"> * can tweak algorithm to determine this top site by implementing determineTopDistributionManagementSiteUrl().</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment"> * @return the site for deployment</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment"> * @see #determineTopDistributionManagementSiteUrl()</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">protected</strong> String getTopDistributionManagementSiteUrl()
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> {
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">if</strong> ( topDistributionManagementSiteUrl == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> topDistributionManagementSiteUrl = determineTopDistributionManagementSiteUrl();
<a class="jxr_linenumber" name="L217" href="#L217">217</a>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> String determineTopDistributionManagementSiteUrl()
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException;
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> <em class="jxr_javadoccomment"> * Get the site used for deployment, with its id to look up credential settings and the target URL for the deploy.</em>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> <em class="jxr_javadoccomment"> * This should be a top-level URL, ie above modules and locale sub-directories. Each deploy mojo</em>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> <em class="jxr_javadoccomment"> * can tweak algorithm to determine this deploy site by implementing determineDeploySite().</em>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> <em class="jxr_javadoccomment"> * @return the site for deployment</em>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> <em class="jxr_javadoccomment"> * @see #determineDeploySite()</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> <strong class="jxr_keyword">protected</strong> Site getDeploySite()
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> {
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">if</strong> ( deploySite == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> {
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> deploySite = determineDeploySite();
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> }
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">return</strong> deploySite;
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> }
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> Site determineDeploySite()
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException;
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment"> * Find the relative path between the distribution URLs of the top site and the current project.</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment"> * @return the relative path or "./" if the two URLs are the same.</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">protected</strong> String getDeployModuleDirectory()
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> {
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> String relative = siteTool.getRelativePath( getSite( project ).getUrl(), getTopDistributionManagementSiteUrl() );
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> <em class="jxr_comment">// SiteTool.getRelativePath() uses File.separatorChar,</em>
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_comment">// so we need to convert '\' to '/' in order for the URL to be valid for Windows users</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> relative = relative.replace( '\\', '/' );
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">return</strong> ( <span class="jxr_string">""</span>.equals( relative ) ) ? <span class="jxr_string">"./"</span> : relative;
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> }
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment"> * Use wagon to deploy the generated site to a given repository.</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment"> * @param repository the repository to deploy to.</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment"> * This needs to contain a valid, non-null {@link Repository#getId() id}</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment"> * to look up credentials for the deploy, and a valid, non-null</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment"> * {@link Repository#getUrl() scm url} to deploy to.</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException if the deploy fails.</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> deployTo( <strong class="jxr_keyword">final</strong> Repository repository )
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> {
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> <strong class="jxr_keyword">if</strong> ( !inputDirectory.exists() )
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> {
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"The site does not exist, please run site:site first"</span> );
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> }
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() )
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> {
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> getLog().debug( <span class="jxr_string">"Deploying to '"</span> + repository.getUrl() + <span class="jxr_string">"',\n Using credentials from server id '"</span>
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> + repository.getId() + <span class="jxr_string">"'"</span> );
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> }
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> deploy( inputDirectory, repository );
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> }
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">if</strong> ( !isDeploy() )
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> {
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> getLog().debug( <span class="jxr_string">"distributionManagement.site.url relative path: "</span> + getDeployModuleDirectory() );
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> }
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> }
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">return</strong> topDistributionManagementSiteUrl;
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> }
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> String determineTopDistributionManagementSiteUrl()
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException;
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> <em class="jxr_javadoccomment"> * Get the site used for deployment, with its id to look up credential settings and the target URL for the deploy.</em>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment"> * This should be a top-level URL, ie above modules and locale sub-directories. Each deploy mojo</em>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment"> * can tweak algorithm to determine this deploy site by implementing determineDeploySite().</em>
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment"> * @return the site for deployment</em>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_javadoccomment"> * @see #determineDeploySite()</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">protected</strong> Site getDeploySite()
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">if</strong> ( deploySite == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> {
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> deploySite = determineDeploySite();
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> }
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <strong class="jxr_keyword">return</strong> deploySite;
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> }
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> Site determineDeploySite()
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException;
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> <em class="jxr_javadoccomment"> * Find the relative path between the distribution URLs of the top site and the current project.</em>
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> <em class="jxr_javadoccomment"> * @return the relative path or "./" if the two URLs are the same.</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <strong class="jxr_keyword">protected</strong> String getDeployModuleDirectory()
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> String relative = siteTool.getRelativePath( getSite( project ).getUrl(),
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> getTopDistributionManagementSiteUrl() );
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_comment">// SiteTool.getRelativePath() uses File.separatorChar,</em>
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_comment">// so we need to convert '\' to '/' in order for the URL to be valid for Windows users</em>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> relative = relative.replace( '\\', '/' );
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <strong class="jxr_keyword">return</strong> ( <span class="jxr_string">""</span>.equals( relative ) ) ? <span class="jxr_string">"./"</span> : relative;
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> }
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment"> * Use wagon to deploy the generated site to a given repository.</em>
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment"> * @param repository the repository to deploy to.</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment"> * This needs to contain a valid, non-null {@link Repository#getId() id}</em>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em class="jxr_javadoccomment"> * to look up credentials for the deploy, and a valid, non-null</em>
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em class="jxr_javadoccomment"> * {@link Repository#getUrl() scm url} to deploy to.</em>
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em class="jxr_javadoccomment"> * @throws MojoExecutionException if the deploy fails.</em>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> deployTo( <strong class="jxr_keyword">final</strong> Repository repository )
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> {
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong class="jxr_keyword">if</strong> ( !inputDirectory.exists() )
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"The site does not exist, please run site:site first"</span> );
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> }
<a class="jxr_linenumber" name="L286" href="#L286">286</a>
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> deploy( <strong class="jxr_keyword">final</strong> File directory, <strong class="jxr_keyword">final</strong> Repository repository )
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> {
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_comment">// TODO: work on moving this into the deployer like the other deploy methods</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> <strong class="jxr_keyword">final</strong> Wagon wagon = getWagon( repository, wagonManager );
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong class="jxr_keyword">if</strong> ( getLog().isDebugEnabled() )
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> {
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> getLog().debug( <span class="jxr_string">"Deploying to '"</span> + repository.getUrl() + <span class="jxr_string">"',\n Using credentials from server id '"</span>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> + repository.getId() + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> }
<a class="jxr_linenumber" name="L292" href="#L292">292</a>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> {
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> configureWagon( wagon, repository.getId(), settings, container, getLog() );
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> }
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> {
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to configure Wagon: '"</span> + repository.getProtocol() + <span class="jxr_string">"'"</span>, e );
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> }
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> deploy( inputDirectory, repository );
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> }
+<a class="jxr_linenumber" name="L295" href="#L295">295</a>
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> deploy( <strong class="jxr_keyword">final</strong> File directory, <strong class="jxr_keyword">final</strong> Repository repository )
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> {
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_comment">// TODO: work on moving this into the deployer like the other deploy methods</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> <strong class="jxr_keyword">final</strong> Wagon wagon = getWagon( repository, wagonManager );
<a class="jxr_linenumber" name="L301" href="#L301">301</a>
<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong class="jxr_keyword">try</strong>
<a class="jxr_linenumber" name="L303" href="#L303">303</a> {
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> <strong class="jxr_keyword">final</strong> ProxyInfo proxyInfo;
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <strong class="jxr_keyword">if</strong> ( !isMaven3OrMore() )
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> {
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> proxyInfo = getProxyInfo( repository, wagonManager );
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> }
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> {
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> {
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> SettingsDecrypter settingsDecrypter = container.lookup( SettingsDecrypter.<strong class="jxr_keyword">class</strong> );
-<a class="jxr_linenumber" name="L314" href="#L314">314</a>
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> proxyInfo = getProxy( repository, settingsDecrypter );
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> }
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> <strong class="jxr_keyword">catch</strong> ( ComponentLookupException cle )
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> {
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to lookup SettingsDecrypter: "</span> + cle.getMessage(), cle );
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> }
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> }
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> push( directory, repository, wagon, proxyInfo, siteTool.getAvailableLocales( locales ),
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> getDeployModuleDirectory() );
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">if</strong> ( chmod )
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> {
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> chmod( wagon, repository, chmodOptions, chmodMode );
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> }
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> }
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> {
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> {
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> wagon.disconnect();
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> }
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <strong class="jxr_keyword">catch</strong> ( ConnectionException e )
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> {
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> getLog().error( <span class="jxr_string">"Error disconnecting wagon - ignored"</span>, e );
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> }
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> }
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> }
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> <strong class="jxr_keyword">private</strong> Wagon getWagon( <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> WagonManager manager )
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> {
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong class="jxr_keyword">final</strong> Wagon wagon;
-<a class="jxr_linenumber" name="L348" href="#L348">348</a>
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> {
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> wagon = manager.getWagon( repository );
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> }
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> <strong class="jxr_keyword">catch</strong> ( UnsupportedProtocolException e )
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> String shortMessage = <span class="jxr_string">"Unsupported protocol: '"</span> + repository.getProtocol() + <span class="jxr_string">"' for site deployment to "</span>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> + <span class="jxr_string">"distributionManagement.site.url="</span> + repository.getUrl() + <span class="jxr_string">"."</span>;
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> String longMessage =
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> <span class="jxr_string">"\n"</span> + shortMessage + <span class="jxr_string">"\n"</span> + <span class="jxr_string">"Currently supported protocols are: "</span> + getSupportedProtocols() + <span class="jxr_string">".\n"</span>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> + <span class="jxr_string">" Protocols may be added through wagon providers.\n"</span> + <span class="jxr_string">" For more information, see "</span>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> + <span class="jxr_string">"http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html"</span>;
-<a class="jxr_linenumber" name="L361" href="#L361">361</a>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> getLog().error( longMessage );
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( shortMessage );
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> }
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> {
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to configure Wagon: '"</span> + repository.getProtocol() + <span class="jxr_string">"'"</span>, e );
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> }
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> <strong class="jxr_keyword">if</strong> ( !wagon.supportsDirectoryCopy() )
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> {
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException(
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <span class="jxr_string">"Wagon protocol '"</span> + repository.getProtocol() + <span class="jxr_string">"' doesn't support directory copying"</span> );
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> }
-<a class="jxr_linenumber" name="L376" href="#L376">376</a>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> <strong class="jxr_keyword">return</strong> wagon;
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> }
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> <strong class="jxr_keyword">private</strong> String getSupportedProtocols()
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> {
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> {
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> Set<String> protocols = container.lookupMap( Wagon.<strong class="jxr_keyword">class</strong> ).keySet();
-<a class="jxr_linenumber" name="L385" href="#L385">385</a>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong class="jxr_keyword">return</strong> StringUtils.join( protocols.iterator(), <span class="jxr_string">", "</span> );
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> }
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong class="jxr_keyword">catch</strong> ( ComponentLookupException e )
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> {
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_comment">// in the unexpected case there is a problem when instantiating a wagon provider</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> getLog().error( e );
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> }
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> }
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> push( <strong class="jxr_keyword">final</strong> File inputDirectory, <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> Wagon wagon,
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> <strong class="jxr_keyword">final</strong> ProxyInfo proxyInfo, <strong class="jxr_keyword">final</strong> List<Locale> localesList, <strong class="jxr_keyword">final</strong> String relativeDir )
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> {
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> AuthenticationInfo authenticationInfo = wagonManager.getAuthenticationInfo( repository.getId() );
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> getLog().debug( <span class="jxr_string">"authenticationInfo with id '"</span> + repository.getId() + <span class="jxr_string">"': "</span>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> + ( ( authenticationInfo == <strong class="jxr_keyword">null</strong> ) ? <span class="jxr_string">"-"</span> : authenticationInfo.getUserName() ) );
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> configureWagon( wagon, repository.getId(), settings, container, getLog() );
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> }
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> {
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to configure Wagon: '"</span> + repository.getProtocol() + <span class="jxr_string">"'"</span>, e );
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> }
+<a class="jxr_linenumber" name="L310" href="#L310">310</a>
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> {
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> <strong class="jxr_keyword">final</strong> ProxyInfo proxyInfo;
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <strong class="jxr_keyword">if</strong> ( !isMaven3OrMore() )
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> {
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> proxyInfo = getProxyInfo( repository, wagonManager );
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> }
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> {
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> {
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> SettingsDecrypter settingsDecrypter = container.lookup( SettingsDecrypter.<strong class="jxr_keyword">class</strong> );
+<a class="jxr_linenumber" name="L323" href="#L323">323</a>
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> proxyInfo = getProxy( repository, settingsDecrypter );
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> }
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">catch</strong> ( ComponentLookupException cle )
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> {
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to lookup SettingsDecrypter: "</span> + cle.getMessage(), cle );
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> }
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> }
+<a class="jxr_linenumber" name="L331" href="#L331">331</a>
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> push( directory, repository, wagon, proxyInfo, getLocales(), getDeployModuleDirectory() );
+<a class="jxr_linenumber" name="L333" href="#L333">333</a>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <strong class="jxr_keyword">if</strong> ( chmod )
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> {
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> chmod( wagon, repository, chmodOptions, chmodMode );
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> }
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> }
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> {
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> {
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> wagon.disconnect();
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> }
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> <strong class="jxr_keyword">catch</strong> ( ConnectionException e )
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> {
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> getLog().error( <span class="jxr_string">"Error disconnecting wagon - ignored"</span>, e );
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> }
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> }
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> }
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> <strong class="jxr_keyword">private</strong> Wagon getWagon( <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> WagonManager manager )
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> {
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <strong class="jxr_keyword">final</strong> Wagon wagon;
+<a class="jxr_linenumber" name="L356" href="#L356">356</a>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> {
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> wagon = manager.getWagon( repository );
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> }
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong class="jxr_keyword">catch</strong> ( UnsupportedProtocolException e )
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> {
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> String shortMessage = <span class="jxr_string">"Unsupported protocol: '"</span> + repository.getProtocol() + <span class="jxr_string">"' for site deployment to "</span>
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> + <span class="jxr_string">"distributionManagement.site.url="</span> + repository.getUrl() + <span class="jxr_string">"."</span>;
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> String longMessage =
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> <span class="jxr_string">"\n"</span> + shortMessage + <span class="jxr_string">"\n"</span> + <span class="jxr_string">"Currently supported protocols are: "</span> + getSupportedProtocols() + <span class="jxr_string">".\n"</span>
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> + <span class="jxr_string">" Protocols may be added through wagon providers.\n"</span> + <span class="jxr_string">" For more information, see "</span>
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> + <span class="jxr_string">"http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html"</span>;
+<a class="jxr_linenumber" name="L369" href="#L369">369</a>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> getLog().error( longMessage );
+<a class="jxr_linenumber" name="L371" href="#L371">371</a>
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( shortMessage );
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> }
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> {
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Unable to configure Wagon: '"</span> + repository.getProtocol() + <span class="jxr_string">"'"</span>, e );
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> }
+<a class="jxr_linenumber" name="L378" href="#L378">378</a>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <strong class="jxr_keyword">if</strong> ( !wagon.supportsDirectoryCopy() )
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> {
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException(
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> <span class="jxr_string">"Wagon protocol '"</span> + repository.getProtocol() + <span class="jxr_string">"' doesn't support directory copying"</span> );
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> }
+<a class="jxr_linenumber" name="L384" href="#L384">384</a>
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <strong class="jxr_keyword">return</strong> wagon;
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> }
+<a class="jxr_linenumber" name="L387" href="#L387">387</a>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong class="jxr_keyword">private</strong> String getSupportedProtocols()
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> {
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> {
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> Set<String> protocols = container.lookupMap( Wagon.<strong class="jxr_keyword">class</strong> ).keySet();
+<a class="jxr_linenumber" name="L393" href="#L393">393</a>
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong class="jxr_keyword">return</strong> StringUtils.join( protocols.iterator(), <span class="jxr_string">", "</span> );
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> }
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong class="jxr_keyword">catch</strong> ( ComponentLookupException e )
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> {
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_comment">// in the unexpected case there is a problem when instantiating a wagon provider</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> getLog().error( e );
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> }
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <strong class="jxr_keyword">return</strong> <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> }
<a class="jxr_linenumber" name="L403" href="#L403">403</a>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> {
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> Debug debug = <strong class="jxr_keyword">new</strong> Debug();
-<a class="jxr_linenumber" name="L407" href="#L407">407</a>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> wagon.addSessionListener( debug );
-<a class="jxr_linenumber" name="L409" href="#L409">409</a>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> wagon.addTransferListener( debug );
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> push( <strong class="jxr_keyword">final</strong> File inputDirectory, <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> Wagon wagon,
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> <strong class="jxr_keyword">final</strong> ProxyInfo proxyInfo, <strong class="jxr_keyword">final</strong> List<Locale> localesList, <strong class="jxr_keyword">final</strong> String relativeDir )
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> {
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> AuthenticationInfo authenticationInfo = wagonManager.getAuthenticationInfo( repository.getId() );
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> getLog().debug( <span class="jxr_string">"authenticationInfo with id '"</span> + repository.getId() + <span class="jxr_string">"': "</span>
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> + ( ( authenticationInfo == <strong class="jxr_keyword">null</strong> ) ? <span class="jxr_string">"-"</span> : authenticationInfo.getUserName() ) );
<a class="jxr_linenumber" name="L411" href="#L411">411</a>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong class="jxr_keyword">if</strong> ( proxyInfo != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> {
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> getLog().debug( <span class="jxr_string">"connect with proxyInfo"</span> );
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> wagon.connect( repository, authenticationInfo, proxyInfo );
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> }
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( proxyInfo == <strong class="jxr_keyword">null</strong> && authenticationInfo != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> {
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> getLog().debug( <span class="jxr_string">"connect with authenticationInfo and without proxyInfo"</span> );
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> wagon.connect( repository, authenticationInfo );
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> }
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> {
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> getLog().debug( <span class="jxr_string">"connect without authenticationInfo and without proxyInfo"</span> );
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> wagon.connect( repository );
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> }
-<a class="jxr_linenumber" name="L427" href="#L427">427</a>
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> getLog().info( <span class="jxr_string">"Pushing "</span> + inputDirectory );
-<a class="jxr_linenumber" name="L429" href="#L429">429</a>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> <em class="jxr_comment">// Default is first in the list</em>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> <strong class="jxr_keyword">final</strong> String defaultLocale = localesList.get( 0 ).getLanguage();
-<a class="jxr_linenumber" name="L432" href="#L432">432</a>
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> <strong class="jxr_keyword">for</strong> ( Locale locale : localesList )
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> {
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> <strong class="jxr_keyword">if</strong> ( locale.getLanguage().equals( defaultLocale ) )
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> {
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_comment">// TODO: this also uploads the non-default locales,</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em class="jxr_comment">// is there a way to exclude directories in wagon?</em>
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> getLog().info( <span class="jxr_string">" >>> to "</span> + repository.getUrl() + relativeDir );
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> {
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> Debug debug = <strong class="jxr_keyword">new</strong> Debug();
+<a class="jxr_linenumber" name="L415" href="#L415">415</a>
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> wagon.addSessionListener( debug );
+<a class="jxr_linenumber" name="L417" href="#L417">417</a>
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> wagon.addTransferListener( debug );
+<a class="jxr_linenumber" name="L419" href="#L419">419</a>
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> <strong class="jxr_keyword">if</strong> ( proxyInfo != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> {
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> getLog().debug( <span class="jxr_string">"connect with proxyInfo"</span> );
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> wagon.connect( repository, authenticationInfo, proxyInfo );
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> }
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( proxyInfo == <strong class="jxr_keyword">null</strong> && authenticationInfo != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> {
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> getLog().debug( <span class="jxr_string">"connect with authenticationInfo and without proxyInfo"</span> );
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> wagon.connect( repository, authenticationInfo );
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> }
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> {
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> getLog().debug( <span class="jxr_string">"connect without authenticationInfo and without proxyInfo"</span> );
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> wagon.connect( repository );
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> }
+<a class="jxr_linenumber" name="L435" href="#L435">435</a>
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> getLog().info( <span class="jxr_string">"Pushing "</span> + inputDirectory );
+<a class="jxr_linenumber" name="L437" href="#L437">437</a>
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em class="jxr_comment">// Default is first in the list</em>
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> <strong class="jxr_keyword">final</strong> String defaultLocale = localesList.get( 0 ).getLanguage();
<a class="jxr_linenumber" name="L440" href="#L440">440</a>
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> wagon.putDirectory( inputDirectory, relativeDir );
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> }
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> <strong class="jxr_keyword">for</strong> ( Locale locale : localesList )
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> {
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong class="jxr_keyword">if</strong> ( locale.getLanguage().equals( defaultLocale ) )
<a class="jxr_linenumber" name="L444" href="#L444">444</a> {
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> getLog().info( <span class="jxr_string">" >>> to "</span> + repository.getUrl() + locale.getLanguage() + <span class="jxr_string">"/"</span> + relativeDir );
-<a class="jxr_linenumber" name="L446" href="#L446">446</a>
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> wagon.putDirectory( <strong class="jxr_keyword">new</strong> File( inputDirectory, locale.getLanguage() ),
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> locale.getLanguage() + <span class="jxr_string">"/"</span> + relativeDir );
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> }
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> }
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> }
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> <strong class="jxr_keyword">catch</strong> ( ResourceDoesNotExistException e )
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> }
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> {
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_comment">// TODO: this also uploads the non-default locales,</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_comment">// is there a way to exclude directories in wagon?</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> getLog().info( <span class="jxr_string">" >>> to "</span> + repository.getUrl() + relativeDir );
+<a class="jxr_linenumber" name="L448" href="#L448">448</a>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> wagon.putDirectory( inputDirectory, relativeDir );
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> }
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> {
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> getLog().info( <span class="jxr_string">" >>> to "</span> + repository.getUrl() + locale.getLanguage() + <span class="jxr_string">"/"</span> + relativeDir );
+<a class="jxr_linenumber" name="L454" href="#L454">454</a>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> wagon.putDirectory( <strong class="jxr_keyword">new</strong> File( inputDirectory, locale.getLanguage() ),
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> locale.getLanguage() + <span class="jxr_string">"/"</span> + relativeDir );
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> }
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> }
<a class="jxr_linenumber" name="L459" href="#L459">459</a> }
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong class="jxr_keyword">catch</strong> ( AuthorizationException e )
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong class="jxr_keyword">catch</strong> ( ResourceDoesNotExistException e )
<a class="jxr_linenumber" name="L461" href="#L461">461</a> {
<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
<a class="jxr_linenumber" name="L463" href="#L463">463</a> }
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">catch</strong> ( ConnectionException e )
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">catch</strong> ( TransferFailedException e )
<a class="jxr_linenumber" name="L465" href="#L465">465</a> {
<a class="jxr_linenumber" name="L466" href="#L466">466</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
<a class="jxr_linenumber" name="L467" href="#L467">467</a> }
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> <strong class="jxr_keyword">catch</strong> ( AuthenticationException e )
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> <strong class="jxr_keyword">catch</strong> ( AuthorizationException e )
<a class="jxr_linenumber" name="L469" href="#L469">469</a> {
<a class="jxr_linenumber" name="L470" href="#L470">470</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
<a class="jxr_linenumber" name="L471" href="#L471">471</a> }
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> }
-<a class="jxr_linenumber" name="L473" href="#L473">473</a>
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> chmod( <strong class="jxr_keyword">final</strong> Wagon wagon, <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> String chmodOptions,
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> <strong class="jxr_keyword">final</strong> String chmodMode )
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> {
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> {
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> <strong class="jxr_keyword">if</strong> ( wagon instanceof CommandExecutor )
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> {
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> CommandExecutor exec = (CommandExecutor) wagon;
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> exec.executeCommand( <span class="jxr_string">"chmod "</span> + chmodOptions + <span class="jxr_string">" "</span> + chmodMode + <span class="jxr_string">" "</span> + repository.getBasedir() );
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> }
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> <em class="jxr_comment">// else ? silently ignore, FileWagon is not a CommandExecutor!</em>
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> }
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> <strong class="jxr_keyword">catch</strong> ( CommandExecutionException e )
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> {
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> }
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> }
-<a class="jxr_linenumber" name="L492" href="#L492">492</a>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment"> * Get the <code>ProxyInfo</code> of the proxy associated with the <code>host</code></em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment"> * and the <code>protocol</code> of the given <code>repository</code>.</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment"> * Extract from <a href="<a href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html" target="alexandria_uri">http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html</a>"></em>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment"> * J2SE Doc : Networking Properties - nonProxyHosts</a> : "The value can be a list of hosts,</em>
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment"> * each separated by a |, and in addition a wildcard character (*) can be used for matching"</em>
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> <em class="jxr_javadoccomment"> * Defensively support for comma (",") and semi colon (";") in addition to pipe ("|") as separator.</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> <strong class="jxr_keyword">catch</strong> ( ConnectionException e )
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> {
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> }
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> <strong class="jxr_keyword">catch</strong> ( AuthenticationException e )
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> {
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> }
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> }
+<a class="jxr_linenumber" name="L481" href="#L481">481</a>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> chmod( <strong class="jxr_keyword">final</strong> Wagon wagon, <strong class="jxr_keyword">final</strong> Repository repository, <strong class="jxr_keyword">final</strong> String chmodOptions,
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">final</strong> String chmodMode )
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> <strong class="jxr_keyword">throws</strong> MojoExecutionException
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> {
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> {
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> <strong class="jxr_keyword">if</strong> ( wagon instanceof CommandExecutor )
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> {
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> CommandExecutor exec = (CommandExecutor) wagon;
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> exec.executeCommand( <span class="jxr_string">"chmod "</span> + chmodOptions + <span class="jxr_string">" "</span> + chmodMode + <span class="jxr_string">" "</span> + repository.getBasedir() );
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> }
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_comment">// else ? silently ignore, FileWagon is not a CommandExecutor!</em>
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> }
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> <strong class="jxr_keyword">catch</strong> ( CommandExecutionException e )
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> {
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> MojoExecutionException( <span class="jxr_string">"Error uploading site"</span>, e );
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> }
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> }
+<a class="jxr_linenumber" name="L500" href="#L500">500</a>
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment"> * Get the <code>ProxyInfo</code> of the proxy associated with the <code>host</code></em>
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> <em class="jxr_javadoccomment"> * and the <code>protocol</code> of the given <code>repository</code>.</em>
<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment"> * @param repository the Repository to extract the ProxyInfo from.</em>
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em class="jxr_javadoccomment"> * @param wagonManager the WagonManager used to connect to the Repository.</em>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em class="jxr_javadoccomment"> * @return a ProxyInfo object instantiated or <code>null</code> if no matching proxy is found</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> ProxyInfo getProxyInfo( Repository repository, WagonManager wagonManager )
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> {
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> ProxyInfo proxyInfo = wagonManager.getProxy( repository.getProtocol() );
-<a class="jxr_linenumber" name="L514" href="#L514">514</a>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> <strong class="jxr_keyword">if</strong> ( proxyInfo == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> {
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> }
-<a class="jxr_linenumber" name="L519" href="#L519">519</a>
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> String host = repository.getHost();
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> String nonProxyHostsAsString = proxyInfo.getNonProxyHosts();
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> <strong class="jxr_keyword">for</strong> ( String nonProxyHost : StringUtils.split( nonProxyHostsAsString, <span class="jxr_string">",;|"</span> ) )
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> {
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> <strong class="jxr_keyword">if</strong> ( StringUtils.contains( nonProxyHost, <span class="jxr_string">"*"</span> ) )
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> {
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_comment">// Handle wildcard at the end, beginning or middle of the nonProxyHost</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pos = nonProxyHost.indexOf( '*' );
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> String nonProxyHostPrefix = nonProxyHost.substring( 0, pos );
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> String nonProxyHostSuffix = nonProxyHost.substring( pos + 1 );
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> <em class="jxr_comment">// prefix*</em>
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( nonProxyHostPrefix ) && host.startsWith( nonProxyHostPrefix )
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> && StringUtils.isEmpty( nonProxyHostSuffix ) )
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> {
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> }
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> <em class="jxr_comment">// *suffix</em>
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> <strong class="jxr_keyword">if</strong> ( StringUtils.isEmpty( nonProxyHostPrefix ) && StringUtils.isNotEmpty( nonProxyHostSuffix )
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> && host.endsWith( nonProxyHostSuffix ) )
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> {
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> }
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> <em class="jxr_comment">// prefix*suffix</em>
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( nonProxyHostPrefix ) && host.startsWith( nonProxyHostPrefix )
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> && StringUtils.isNotEmpty( nonProxyHostSuffix ) && host.endsWith( nonProxyHostSuffix ) )
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> {
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> }
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> }
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( host.equals( nonProxyHost ) )
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> {
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> }
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> }
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> <strong class="jxr_keyword">return</strong> proxyInfo;
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> }
-<a class="jxr_linenumber" name="L556" href="#L556">556</a>
[... 682 lines stripped ...]