Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B899ED999 for ; Wed, 29 Aug 2012 21:26:41 +0000 (UTC) Received: (qmail 34779 invoked by uid 500); 29 Aug 2012 21:26:41 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 34727 invoked by uid 500); 29 Aug 2012 21:26:41 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 34720 invoked by uid 99); 29 Aug 2012 21:26:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 21:26:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 21:26:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04764238897F; Wed, 29 Aug 2012 21:25:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1378744 - in /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish: ScmPublishPublishMojo.java ScmPublishPublishScmMojo.java Date: Wed, 29 Aug 2012 21:25:54 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120829212555.04764238897F@eris.apache.org> 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(),