Not sure the comment is correct in fact :-). I just wanted to have an option to not delete files (safe option for testing purpose)
2012/8/22 Hervé BOUTEMY <[email protected]>: > IMHO, this one is not needed: ScmPublishPublishScmMojo.update takes care of > modules already (see javadoc) > > Regards, > > Hervé > > Le mercredi 22 août 2012 16:13:35 [email protected] a écrit : >> Author: olamy >> Date: Wed Aug 22 16:13:34 2012 >> New Revision: 1376120 >> >> URL: http://svn.apache.org/viewvc?rev=1376120&view=rev >> Log: >> parameter to skip file deletions on the scm : can help for project with >> multi modules >> >> Modified: >> >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/AbstractScmPublishMojo.java >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/ScmPublishPublishMojo.java >> >> Modified: >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/AbstractScmPublishMojo.java URL: >> http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish- >> plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishM >> ojo.java?rev=1376120&r1=1376119&r2=1376120&view=diff >> =========================================================================== >> === --- >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/AbstractScmPublishMojo.java (original) +++ >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/AbstractScmPublishMojo.java Wed Aug 22 16:13:34 >> 2012 @@ -167,6 +167,13 @@ public abstract class AbstractScmPublish >> */ >> protected boolean tryUpdate; >> >> + /** >> + * Do not delete files to the scm >> + * >> + * @parameter expression="${scmpublish.skipDeletedFiles}" >> default-value="false" + */ >> + protected boolean skipDeletedFiles; >> + >> protected ScmProvider scmProvider; >> >> protected ScmRepository scmRepository; >> >> Modified: >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/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/ScmPublishPublishMo >> jo.java?rev=1376120&r1=1376119&r2=1376120&view=diff >> =========================================================================== >> === --- >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/ScmPublishPublishMojo.java (original) +++ >> maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apac >> he/maven/plugins/scmpublish/ScmPublishPublishMojo.java Wed Aug 22 16:13:34 >> 2012 @@ -19,6 +19,17 @@ package org.apache.maven.plugins.scmpubl >> * under the License. >> */ >> >> +import org.apache.commons.io.FileUtils; >> +import org.apache.commons.io.FilenameUtils; >> +import org.apache.commons.io.IOUtils; >> +import org.apache.maven.plugin.MojoExecutionException; >> +import org.apache.maven.plugin.MojoFailureException; >> +import org.apache.maven.scm.ScmException; >> +import org.apache.maven.scm.ScmFileSet; >> +import org.apache.maven.scm.command.add.AddScmResult; >> +import org.apache.maven.scm.command.checkin.CheckInScmResult; >> +import org.apache.maven.scm.command.remove.RemoveScmResult; >> + >> import java.io.BufferedReader; >> import java.io.File; >> import java.io.FileInputStream; >> @@ -34,20 +45,9 @@ import java.util.List; >> import java.util.Set; >> import java.util.TreeSet; >> >> -import org.apache.commons.io.FileUtils; >> -import org.apache.commons.io.FilenameUtils; >> -import org.apache.commons.io.IOUtils; >> -import org.apache.maven.plugin.MojoExecutionException; >> -import org.apache.maven.plugin.MojoFailureException; >> -import org.apache.maven.scm.ScmException; >> -import org.apache.maven.scm.ScmFileSet; >> -import org.apache.maven.scm.command.add.AddScmResult; >> -import org.apache.maven.scm.command.checkin.CheckInScmResult; >> -import org.apache.maven.scm.command.remove.RemoveScmResult; >> - >> /** >> * Compare the list of files now on disk to the original inventory, then >> fire off scm adds and deletes as needed. - * >> + * >> * @goal publish >> * @phase post-site >> * @aggregate >> @@ -59,20 +59,21 @@ public class ScmPublishPublishMojo >> >> /** >> * Display list of added, deleted, and changed files, but do not do any >> actual SCM operations. - * >> + * >> * @parameter expression="${scmpublish.dryRun}" >> */ >> private boolean dryRun; >> >> /** >> * Run add and delete commands, but leave the actually checkin for the >> user to run manually. - * >> + * >> * @parameter expression="${scmpublish.skipCheckin}" >> */ >> private boolean skipCheckin; >> >> /** >> * SCM log/checkin comment for this publication. >> + * >> * @parameter expression="${scmpublish.checkinComment}" >> default-value="Site checkin for project ${project.name}" */ >> private String checkinComment; >> @@ -106,7 +107,7 @@ public class ScmPublishPublishMojo >> in = new BufferedReader( new InputStreamReader( new >> FileInputStream( tmpFile ), siteOutputEncoding ) ); out = new PrintWriter( >> new OutputStreamWriter( new FileOutputStream( f ), siteOutputEncoding ) ); >> String line; >> - while ( ( line = in.readLine() ) != null ) >> + while ( ( line = in.readLine() ) != null ) >> { >> if ( in.ready() ) >> { >> @@ -209,7 +210,7 @@ public class ScmPublishPublishMojo >> >> /** >> * Check-in content from scm checkout. >> - * >> + * >> * @throws MojoExecutionException >> */ >> protected void checkinFiles() >> @@ -228,8 +229,8 @@ public class ScmPublishPublishMojo >> { >> logError( "checkin operation failed: %s", >> checkinResult.getProviderMessage() + " " + >> checkinResult.getCommandOutput() ); - throw new >> MojoExecutionException( "Failed to checkin files: " + >> checkinResult.getProviderMessage() - + " " + >> checkinResult.getCommandOutput() ); >> + throw new MojoExecutionException( "Failed to checkin files: >> " + checkinResult.getProviderMessage() + " " + >> + checkinResult.getCommandOutput() ); } >> } >> catch ( ScmException e ) >> @@ -241,6 +242,11 @@ public class ScmPublishPublishMojo >> protected void deleteFiles( Collection<File> deleted ) >> throws MojoExecutionException >> { >> + if ( skipDeletedFiles ) >> + { >> + logInfo( "deleting files is skipped" ); >> + return; >> + } >> List<File> deletedList = new ArrayList<File>(); >> for ( File f : deleted ) >> { >> @@ -255,8 +261,8 @@ public class ScmPublishPublishMojo >> { >> logError( "delete operation failed: %s", >> deleteResult.getProviderMessage() + " " + >> deleteResult.getCommandOutput() ); - throw new >> MojoExecutionException( "Failed to delete files: " + >> deleteResult.getProviderMessage() - + " " + >> deleteResult.getCommandOutput() ); >> + throw new MojoExecutionException( "Failed to delete files: >> " + deleteResult.getProviderMessage() + " " + >> + deleteResult.getCommandOutput() ); } >> } >> catch ( ScmException e ) >> @@ -267,7 +273,7 @@ public class ScmPublishPublishMojo >> >> /** >> * Add files to scm. >> - * >> + * >> * @param added files to be added >> * @throws MojoFailureException >> * @throws MojoExecutionException >> @@ -301,9 +307,9 @@ public class ScmPublishPublishMojo >> >> for ( File relativized : dirsToAdd ) >> { >> - try >> + try >> { >> - ScmFileSet fileSet = new ScmFileSet( checkoutDirectory , >> relativized ); + ScmFileSet fileSet = new ScmFileSet( >> checkoutDirectory, relativized ); AddScmResult addDirResult = >> scmProvider.add( scmRepository, fileSet, "Adding directory" ); if ( >> !addDirResult.isSuccess() ) >> { >> @@ -324,8 +330,8 @@ public class ScmPublishPublishMojo >> { >> logError( "add operation failed: %s", >> addResult.getProviderMessage() + " " + >> addResult.getCommandOutput() ); - throw new >> MojoExecutionException( "Failed to add new files: " + >> addResult.getProviderMessage() - + " " + >> addResult.getCommandOutput() ); >> + throw new MojoExecutionException( >> + "Failed to add new files: " + >> addResult.getProviderMessage() + " " + addResult.getCommandOutput() ); } >> } >> catch ( ScmException e ) > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
