You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/09 09:45:30 UTC
svn commit: r1079701 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Wed Mar 9 08:45:29 2011
New Revision: 1079701
URL: http://svn.apache.org/viewvc?rev=1079701&view=rev
Log:
merge r1079698 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 08:45:29 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079529
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079529,1079698
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1079701&r1=1079700&r2=1079701&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Wed Mar 9 08:45:29 2011
@@ -159,6 +159,7 @@ public abstract class AbstractDeployMojo
* @return the id to look up credentials for the deploy. Not null.
*
* @throws MojoExecutionException
+ * if the ID cannot be determined
*/
protected abstract String getDeployRepositoryID()
throws MojoExecutionException;
@@ -170,6 +171,7 @@ public abstract class AbstractDeployMojo
* @return the url to deploy to. Not null.
*
* @throws MojoExecutionException
+ * if the URL cannot be constructed
*/
protected abstract String getDeployRepositoryURL()
throws MojoExecutionException;
@@ -178,6 +180,8 @@ public abstract class AbstractDeployMojo
* Find the relative path between the distribution URLs of the top parent and the current project.
*
* @return a String starting with "/".
+ *
+ * @throws MojoExecutionException
*/
private String getDeployModuleDirectory()
throws MojoExecutionException
@@ -217,7 +221,7 @@ public abstract class AbstractDeployMojo
deploy( inputDirectory, repository );
}
- private void deploy( final File inputDirectory, final Repository repository )
+ private void deploy( final File directory, final Repository repository )
throws MojoExecutionException
{
// TODO: work on moving this into the deployer like the other deploy methods
@@ -236,7 +240,7 @@ public abstract class AbstractDeployMojo
{
final ProxyInfo proxyInfo = getProxy( repository, getLog(), mavenSession, settingsDecrypter );
- push( inputDirectory, repository, wagonManager, wagon, proxyInfo,
+ push( directory, repository, wagonManager, wagon, proxyInfo,
siteTool.getAvailableLocales( locales ), getDeployModuleDirectory(), getLog() );
if ( chmod )
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=1079701&r1=1079700&r2=1079701&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Wed Mar 9 08:45:29 2011
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.site;
import org.apache.maven.model.Site;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
/**
* Deploys the generated site using <code>scp</code> or <code>file</code>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java?rev=1079701&r1=1079700&r2=1079701&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java Wed Mar 9 08:45:29 2011
@@ -47,6 +47,12 @@ public class SiteMap
private String encoding;
private I18N i18n;
+ /**
+ * Constructor sets default values.
+ *
+ * @param encoding the default encoding to use when writing the output file.
+ * @param i18n the default I18N for translations.
+ */
public SiteMap( String encoding, I18N i18n )
{
this.encoding = encoding;