Author: ltheussl
Date: Tue Dec 15 21:47:19 2009
New Revision: 891014
URL: http://svn.apache.org/viewvc?rev=891014&view=rev
Log:
javadocs
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=891014&r1=891013&r2=891014&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Tue Dec 15 21:47:19 2009
@@ -151,7 +151,7 @@
* Alternative directory for xdoc source, useful for m1 to m2 migration
*
* @parameter default-value="${basedir}/xdocs"
- * @deprecated
+ * @deprecated use the standard m2 directory layout
*/
private File xdocDirectory;
@@ -300,8 +300,9 @@
*
* @param reports A List of MavenReports
* @param documents A Map of documents, keyed by filename
- * @return A map with all reports keyed by filename having the report
itself as value. The map will be used to
- * populate a menu.
+ * @param locale the Locale the reports are processed for.
+ * @return A map with all reports keyed by filename having the report
itself as value.
+ * The map will be used to populate a menu.
*/
protected Map locateReports( List reports, Map documents, Locale locale )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=891014&r1=891013&r2=891014&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Tue Dec 15 21:47:19 2009
@@ -271,6 +271,8 @@
* Defensively support for comma (",") and semi colon (";") in addition to
pipe ("|") as separator.
* </p>
*
+ * @param repository the Repository to extract the ProxyInfo from.
+ * @param wagonManager the WagonManager used to connect to the Repository.
* @return a ProxyInfo object instantiated or <code>null</code> if no
matching proxy is found
*/
public static ProxyInfo getProxyInfo( Repository repository, WagonManager
wagonManager )
