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/08/29 23:25:54 UTC
svn commit: r1378744 - in
/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish:
ScmPublishPublishMojo.java ScmPublishPublishScmMojo.java
Author: hboutemy
Date: Wed Aug 29 21:25:54 2012
New Revision: 1378744
URL: http://svn.apache.org/viewvc?rev=1378744&view=rev
Log:
improved messages
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java?rev=1378744&r1=1378743&r2=1378744&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java Wed Aug 29 21:25:54 2012
@@ -327,11 +327,11 @@ public class ScmPublishPublishMojo
try
{
ScmFileSet fileSet = new ScmFileSet( checkoutDirectory, relativized );
- getLog().debug( "scm add directory:" + relativized );
+ getLog().debug( "scm add directory: " + relativized );
AddScmResult addDirResult = scmProvider.add( scmRepository, fileSet, "Adding directory" );
if ( !addDirResult.isSuccess() )
{
- getLog().debug( " Error adding directory " + relativized + " " + addDirResult.getCommandOutput() );
+ getLog().debug( " Error adding directory " + relativized + ": " + addDirResult.getCommandOutput() );
}
}
catch ( ScmException e )
@@ -344,7 +344,7 @@ public class ScmPublishPublishMojo
addedList.removeAll( dirsToAdd );
ScmFileSet addedFileSet = new ScmFileSet( checkoutDirectory, addedList );
- getLog().debug( "scm add files:" + addedList );
+ getLog().debug( "scm add files: " + addedList );
try
{
CommandParameters commandParameters = new CommandParameters();
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1378744&r1=1378743&r2=1378744&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Wed Aug 29 21:25:54 2012
@@ -105,7 +105,7 @@ public class ScmPublishPublishScmMojo
{
if ( ignoreDeleteMatchPatterns != null && ignoreDeleteMatchPatterns.matches( name, true ) )
{
- getLog().debug( name + " match one of the patterns '" + pathsAsList + "' do not add to deleted files" );
+ getLog().debug( name + " match one of the patterns '" + pathsAsList + "': do not add to deleted files" );
continue;
}
File file = new File( checkout, name );
@@ -220,9 +220,14 @@ public class ScmPublishPublishScmMojo
siteOutputEncoding = "utf-8";
}
+ if ( !content.exists() )
+ {
+ throw new MojoExecutionException( "Configured content directory does not exist: " + content );
+ }
+
if ( !content.canRead() )
{
- throw new MojoExecutionException( "can't read content directory: " + content );
+ throw new MojoExecutionException( "Can't read content directory: " + content );
}
checkoutExisting();
@@ -234,7 +239,7 @@ public class ScmPublishPublishScmMojo
}
catch ( IOException ioe )
{
- throw new MojoExecutionException( "could not copy content to scm checkout", ioe );
+ throw new MojoExecutionException( "Could not copy content to scm checkout", ioe );
}
logInfo( "Publish files: %d addition(s), %d update(s), %d delete(s)", added.size(), updated.size(),