Author: ltheussl
Date: Wed Mar 23 12:38:36 2011
New Revision: 1084565
URL: http://svn.apache.org/viewvc?rev=1084565&view=rev
Log:
merge r1084564 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/SiteStageDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 12:38:36 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,1039748-1039749,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,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473
+/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,1039748-1039749,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,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564
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=1084565&r1=1084564&r2=1084565&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 23 12:38:36 2011
@@ -352,6 +352,8 @@ public abstract class AbstractDeployMojo
wagon.connect( repository );
}
+ log.info( "Pushing " + inputDirectory );
+
// Default is first in the list
final String defaultLocale = localesList.get( 0 ).getLanguage();
@@ -362,11 +364,13 @@ public abstract class AbstractDeployMojo
// TODO: this also uploads the non-default locales,
// is there a way to exclude directories in wagon?
wagon.putDirectory( inputDirectory, relativeDir );
+ log.info( " to " + repository.getUrl() + relativeDir +
": done" );
}
else
{
wagon.putDirectory( new File( inputDirectory,
locale.getLanguage() ),
locale.getLanguage() + relativeDir );
+ log.info( " to " + repository.getUrl() +
locale.getLanguage() + relativeDir + ": done" );
}
}
}
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=1084565&r1=1084564&r2=1084565&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Wed Mar 23 12:38:36 2011
@@ -80,7 +80,7 @@ public class SiteStageDeployMojo
{
stagingSiteURL = getStagingSiteURL( stagingSiteURL );
- getLog().info( "Using this URL for stage deploy: " + stagingSiteURL );
+ getLog().info( "Using this base URL for stage deploy: " +
stagingSiteURL );
return stagingSiteURL;
}
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=1084565&r1=1084564&r2=1084565&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Wed Mar 23 12:38:36 2011
@@ -66,7 +66,7 @@ public class SiteStageMojo
final String stageDir = ( stagingDirectory == null ) ? null :
stagingDirectory.getAbsolutePath();
final String outputDir = getStagingDirectory( stageDir );
- getLog().info( "Using this directory for staging: " + outputDir );
+ getLog().info( "Using this base directory for staging: " + outputDir );
final File outputDirectory = new File( outputDir );
// Safety
