svn commit: r1435626 - in /maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish: AbstractScmPublishMojo.java ScmPublishPublishScmMojo.java

[hboutemy]

Author: hboutemy
Date: Sat Jan 19 18:01:35 2013
New Revision: 1435626

URL: http://svn.apache.org/viewvc?rev=1435626&view=rev
Log:
improved plugin output

Modified:
    
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
    
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java

Modified: 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1435626&r1=1435625&r2=1435626&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
 Sat Jan 19 18:01:35 2013
@@ -508,8 +508,6 @@ public abstract class AbstractScmPublish
         ScmFileSet updatedFileSet = new ScmFileSet( checkoutDirectory );
         try
         {
-            logInfo( "Checking in to the scm" );
-
             CheckInScmResult checkinResult =
                 checkScmResult( scmProvider.checkIn( scmRepository, 
updatedFileSet, new ScmBranch( scmBranch ),
                                                      checkinComment ), 
"check-in files to SCM" );

Modified: 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1435626&r1=1435625&r2=1435626&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
 Sat Jan 19 18:01:35 2013
@@ -109,7 +109,7 @@ public class ScmPublishPublishScmMojo
                     name + " match one of the patterns '" + pathsAsList + "': 
do not add to deleted files" );
                 continue;
             }
-            getLog().debug( "file marked for deletion:" + name );
+            getLog().debug( "file marked for deletion: " + name );
             File file = new File( checkout, name );
 
             if ( ( doNotDeleteDirs != null ) && file.isDirectory() && ( 
doNotDeleteDirs.contains( name ) ) )
@@ -236,30 +236,31 @@ public class ScmPublishPublishScmMojo
 
         try
         {
-            logInfo( "Updating content..." );
+            logInfo( "Updating checkout directory with actual content: %s", 
content );
             update( checkoutDirectory, content, ( project == null ) ? null : 
project.getModel().getModules() );
         }
         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(),
-                 deleted.size() );
+        logInfo( "Publishing content into SCM will result in %d addition(s), 
%d update(s), %d delete(s)", added.size(),
+                 updated.size(), deleted.size() );
 
         if ( isDryRun() )
         {
+            int pos = checkoutDirectory.getAbsolutePath().length() + 1;
             for ( File addedFile : added )
             {
-                logInfo( "Added %s", addedFile.getAbsolutePath() );
+                logInfo( "- added   %s", 
addedFile.getAbsolutePath().substring( pos ) );
             }
             for ( File deletedFile : deleted )
             {
-                logInfo( "Deleted %s", deletedFile.getAbsolutePath() );
+                logInfo( "- deleted %s", 
deletedFile.getAbsolutePath().substring( pos ) );
             }
             for ( File updatedFile : updated )
             {
-                logInfo( "Updated %s", updatedFile.getAbsolutePath() );
+                logInfo( "- updated %s", 
updatedFile.getAbsolutePath().substring( pos ) );
             }
             return;
         }