You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/08 13:51:15 UTC
svn commit: r816547 [23/23] - in
/websites/production/maventest/content/plugins/maven-site-plugin-latest: ./
apidocs/ apidocs/org/apache/maven/doxia/sink/
apidocs/org/apache/maven/doxia/sink/class-use/
apidocs/org/apache/maven/plugins/site/ apidocs/org...
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageDeployMojo.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageDeployMojo.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageDeployMojo.html Tue May 8 11:51:09 2012
@@ -55,9 +55,9 @@
<a name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> java.util.List;
<a name="46" href="#46">46</a>
<a name="47" href="#47">47</a> <em class="jxr_javadoccomment">/**</em>
-<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * Deploys the generated site to a staging or mock directory on the site</em>
+<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * Deploys the generated site to a staging or mock directory to the site URL</em>
<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * specified in the <code>&lt;distributionManagement&gt;</code> section of the</em>
-<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * POM. It also supports <code>scp</code> and <code>file</code> protocols for</em>
+<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * POM. It supports <code>scp</code> and <code>file</code> protocols for</em>
<a name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * deployment.</em>
<a name="52" href="#52">52</a> <em class="jxr_javadoccomment"> *</em>
<a name="53" href="#53">53</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:vincent.siveton@gmail.com" target="alexandria_uri">mailto:vincent.siveton@gmail.com</a>">Vincent Siveton</a></em>
@@ -129,7 +129,7 @@
<a name="119" href="#119">119</a> Wagon wagon;
<a name="120" href="#120">120</a> <strong class="jxr_keyword">try</strong>
<a name="121" href="#121">121</a> {
-<a name="122" href="#122">122</a> wagon = wagonManager.getWagon( repository.getProtocol() );
+<a name="122" href="#122">122</a> wagon = wagonManager.getWagon( repository );
<a name="123" href="#123">123</a> SiteDeployMojo.configureWagon( wagon, STAGING_SERVER_ID, settings, container, getLog() );
<a name="124" href="#124">124</a> }
<a name="125" href="#125">125</a> <strong class="jxr_keyword">catch</strong> ( UnsupportedProtocolException e )
@@ -248,24 +248,27 @@
<a name="238" href="#238">238</a> <em class="jxr_comment">// Find the relative path between the parent and child distribution URLs, if any</em>
<a name="239" href="#239">239</a> relative = <span class="jxr_string">"/"</span> + siteTool.getRelativePath( currentProject.getDistributionManagement().getSite().getUrl(),
<a name="240" href="#240">240</a> topLevelProject.getDistributionManagement().getSite().getUrl() );
-<a name="241" href="#241">241</a>
-<a name="242" href="#242">242</a> <strong class="jxr_keyword">if</strong> ( topLevelURL == <strong class="jxr_keyword">null</strong> )
-<a name="243" href="#243">243</a> {
-<a name="244" href="#244">244</a> <em class="jxr_comment">// The user didn't specify a URL and there is a top level project in the reactor</em>
-<a name="245" href="#245">245</a> <em class="jxr_comment">// Use the top level project</em>
-<a name="246" href="#246">246</a> getLog().debug( <span class="jxr_string">"Using the top level project found in the reactor."</span> );
-<a name="247" href="#247">247</a> topLevelURL =
-<a name="248" href="#248">248</a> topLevelProject.getDistributionManagement().getSite().getUrl() + <span class="jxr_string">"/"</span> + DEFAULT_STAGING_DIRECTORY;
-<a name="249" href="#249">249</a> }
-<a name="250" href="#250">250</a> }
-<a name="251" href="#251">251</a>
-<a name="252" href="#252">252</a> <em class="jxr_comment">// Return either</em>
-<a name="253" href="#253">253</a> <em class="jxr_comment">// usersURL + relative(from parent, to child)</em>
-<a name="254" href="#254">254</a> <em class="jxr_comment">// or</em>
-<a name="255" href="#255">255</a> <em class="jxr_comment">// topLevelProjectURL + staging + relative(from parent, to child)</em>
-<a name="256" href="#256">256</a> <strong class="jxr_keyword">return</strong> topLevelURL + relative;
-<a name="257" href="#257">257</a> }
-<a name="258" href="#258">258</a> }
+<a name="241" href="#241">241</a> <em class="jxr_comment">// SiteTool.getRelativePath() uses File.separatorChar, so we need to convert '\' to '/' in order for the URL</em>
+<a name="242" href="#242">242</a> <em class="jxr_comment">// to be valid for Windows users</em>
+<a name="243" href="#243">243</a> relative = relative.replace( '\\', '/' );
+<a name="244" href="#244">244</a>
+<a name="245" href="#245">245</a> <strong class="jxr_keyword">if</strong> ( topLevelURL == <strong class="jxr_keyword">null</strong> )
+<a name="246" href="#246">246</a> {
+<a name="247" href="#247">247</a> <em class="jxr_comment">// The user didn't specify a URL and there is a top level project in the reactor</em>
+<a name="248" href="#248">248</a> <em class="jxr_comment">// Use the top level project</em>
+<a name="249" href="#249">249</a> getLog().debug( <span class="jxr_string">"Using the top level project found in the reactor."</span> );
+<a name="250" href="#250">250</a> topLevelURL =
+<a name="251" href="#251">251</a> topLevelProject.getDistributionManagement().getSite().getUrl() + <span class="jxr_string">"/"</span> + DEFAULT_STAGING_DIRECTORY;
+<a name="252" href="#252">252</a> }
+<a name="253" href="#253">253</a> }
+<a name="254" href="#254">254</a>
+<a name="255" href="#255">255</a> <em class="jxr_comment">// Return either</em>
+<a name="256" href="#256">256</a> <em class="jxr_comment">// usersURL + relative(from parent, to child)</em>
+<a name="257" href="#257">257</a> <em class="jxr_comment">// or</em>
+<a name="258" href="#258">258</a> <em class="jxr_comment">// topLevelProjectURL + staging + relative(from parent, to child)</em>
+<a name="259" href="#259">259</a> <strong class="jxr_keyword">return</strong> topLevelURL + relative;
+<a name="260" href="#260">260</a> }
+<a name="261" href="#261">261</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageMojo.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageMojo.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/SiteStageMojo.html Tue May 8 11:51:09 2012
@@ -42,7 +42,7 @@
<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> java.util.List;
<a name="33" href="#33">33</a>
<a name="34" href="#34">34</a> <em class="jxr_javadoccomment">/**</em>
-<a name="35" href="#35">35</a> <em class="jxr_javadoccomment"> * Generates a site in a local staging or mock directory based on the site url</em>
+<a name="35" href="#35">35</a> <em class="jxr_javadoccomment"> * Generates a site in a local staging or mock directory based on the site URL</em>
<a name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * specified in the <code>&lt;distributionManagement&gt;</code> section of the</em>
<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * POM.</em>
<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * <p></em>
@@ -63,7 +63,7 @@
<a name="53" href="#53">53</a> <em class="jxr_javadoccomment">/**</em>
<a name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * Staging directory location. This needs to be an absolute path, like</em>
<a name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * <code>C:\stagingArea\myProject\</code> on Windows or</em>
-<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * <code>/stagingArea/myProject/</code> on Unix. </em>
+<a name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * <code>/stagingArea/myProject/</code> on Unix.</em>
<a name="57" href="#57">57</a> <em class="jxr_javadoccomment"> *</em>
<a name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * @parameter expression="${stagingDirectory}"</em>
<a name="59" href="#59">59</a> <em class="jxr_javadoccomment"> */</em>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-frame.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-frame.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-frame.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.plugins.site</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.plugins.site</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-summary.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-summary.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/package-summary.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.plugins.site</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.plugins.site</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -127,6 +127,6 @@
</ul>
</div>
<hr />
- Copyright © 2002-2008 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2002-2009 The Apache Software Foundation. All Rights Reserved.
</body>
</html>
\ No newline at end of file
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-frame.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-frame.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-frame.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.plugins.site.webapp</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.plugins.site.webapp</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-summary.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-summary.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/plugins/site/webapp/package-summary.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.plugins.site.webapp</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.plugins.site.webapp</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -67,6 +67,6 @@
</ul>
</div>
<hr />
- Copyright © 2002-2008 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2002-2009 The Apache Software Foundation. All Rights Reserved.
</body>
</html>
\ No newline at end of file
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/MavenMultiPageReport.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/MavenMultiPageReport.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/MavenMultiPageReport.html Tue May 8 11:51:09 2012
@@ -40,14 +40,18 @@
<a name="30" href="#30">30</a> <em class="jxr_javadoccomment"> * method should be dropped. But that will render all reporting mojo's </em>
<a name="31" href="#31">31</a> <em class="jxr_javadoccomment"> * uncompilable. </em>
<a name="32" href="#32">32</a> <em class="jxr_javadoccomment"> *</em>
-<a name="33" href="#33">33</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:kenney@apache.org" target="alexandria_uri">mailto:kenney@apache.org</a>">Kenney Westerhof</a></em>
-<a name="34" href="#34">34</a> <em class="jxr_javadoccomment"> */</em>
-<a name="35" href="#35">35</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../org/apache/maven/reporting/MavenMultiPageReport.html">MavenMultiPageReport</a>
-<a name="36" href="#36">36</a> <strong class="jxr_keyword">extends</strong> MavenReport
-<a name="37" href="#37">37</a> {
-<a name="38" href="#38">38</a> <strong class="jxr_keyword">void</strong> generate( Sink sink, SinkFactory sinkFactory, Locale locale )
-<a name="39" href="#39">39</a> <strong class="jxr_keyword">throws</strong> MavenReportException;
-<a name="40" href="#40">40</a> }
+<a name="33" href="#33">33</a> <em class="jxr_javadoccomment"> * This interface was copied from reporting-api 3.0, to avoid upgrading prerequisite</em>
+<a name="34" href="#34">34</a> <em class="jxr_javadoccomment"> * to Maven 3.0.</em>
+<a name="35" href="#35">35</a> <em class="jxr_javadoccomment"> *</em>
+<a name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:kenney@apache.org" target="alexandria_uri">mailto:kenney@apache.org</a>">Kenney Westerhof</a></em>
+<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * @todo MSITE-369 remove this class when Maven 3.0 as prerequisite is ok</em>
+<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> */</em>
+<a name="39" href="#39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../org/apache/maven/reporting/MavenMultiPageReport.html">MavenMultiPageReport</a>
+<a name="40" href="#40">40</a> <strong class="jxr_keyword">extends</strong> MavenReport
+<a name="41" href="#41">41</a> {
+<a name="42" href="#42">42</a> <strong class="jxr_keyword">void</strong> generate( Sink sink, SinkFactory sinkFactory, Locale locale )
+<a name="43" href="#43">43</a> <strong class="jxr_keyword">throws</strong> MavenReportException;
+<a name="44" href="#44">44</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-frame.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-frame.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-frame.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.reporting</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.reporting</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-summary.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-summary.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/org/apache/maven/reporting/package-summary.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference Package org.apache.maven.reporting</title>
+ <title>Maven Site Plugin 2.0 Reference Package org.apache.maven.reporting</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -62,6 +62,6 @@
</ul>
</div>
<hr />
- Copyright © 2002-2008 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2002-2009 The Apache Software Foundation. All Rights Reserved.
</body>
</html>
\ No newline at end of file
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-frame.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-frame.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-frame.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference</title>
+ <title>Maven Site Plugin 2.0 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
@@ -27,24 +27,6 @@
<li>
<a href="org/apache/maven/reporting/package-frame.html" target="packageFrame">org.apache.maven.reporting</a>
</li>
- <li>
- <a href="org/codehaus/plexus/util/package-frame.html" target="packageFrame">org.codehaus.plexus.util</a>
- </li>
- <li>
- <a href="org/codehaus/plexus/util/cli/package-frame.html" target="packageFrame">org.codehaus.plexus.util.cli</a>
- </li>
- <li>
- <a href="org/codehaus/plexus/util/cli/shell/package-frame.html" target="packageFrame">org.codehaus.plexus.util.cli.shell</a>
- </li>
- <li>
- <a href="org/codehaus/plexus/util/interpolation/package-frame.html" target="packageFrame">org.codehaus.plexus.util.interpolation</a>
- </li>
- <li>
- <a href="org/codehaus/plexus/util/introspection/package-frame.html" target="packageFrame">org.codehaus.plexus.util.introspection</a>
- </li>
- <li>
- <a href="org/codehaus/plexus/util/xml/package-frame.html" target="packageFrame">org.codehaus.plexus.util.xml</a>
- </li>
</ul>
</body>
Modified: websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-summary.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-summary.html (original)
+++ websites/production/maventest/content/plugins/maven-site-plugin-latest/xref/overview-summary.html Tue May 8 11:51:09 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>Maven Site Plugin 2.0-beta-7 Reference</title>
+ <title>Maven Site Plugin 2.0 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
@@ -24,7 +24,7 @@
</ul>
</div>
- <h2>Maven Site Plugin 2.0-beta-7 Reference</h2>
+ <h2>Maven Site Plugin 2.0 Reference</h2>
<table class="summary">
<thead>
@@ -53,36 +53,6 @@
<a href="org/apache/maven/reporting/package-summary.html">org.apache.maven.reporting</a>
</td>
</tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/package-summary.html">org.codehaus.plexus.util</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/cli/package-summary.html">org.codehaus.plexus.util.cli</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/cli/shell/package-summary.html">org.codehaus.plexus.util.cli.shell</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/interpolation/package-summary.html">org.codehaus.plexus.util.interpolation</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/introspection/package-summary.html">org.codehaus.plexus.util.introspection</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="org/codehaus/plexus/util/xml/package-summary.html">org.codehaus.plexus.util.xml</a>
- </td>
- </tr>
</tbody>
</table>
@@ -104,6 +74,6 @@
</div>
<hr />
- Copyright © 2002-2008 The Apache Software Foundation. All Rights Reserved.
+ Copyright © 2002-2009 The Apache Software Foundation. All Rights Reserved.
</body>
</html>
\ No newline at end of file