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/05/05 22:38:26 UTC
svn commit: r1334493 - in
/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish:
ScmPublishInventory.java ScmPublishInventoryMojo.java
ScmPublishPublishMojo.java ScmPublishPublishScmMojo.java
Author: hboutemy
Date: Sat May 5 20:38:26 2012
New Revision: 1334493
URL: http://svn.apache.org/viewvc?rev=1334493&view=rev
Log:
ignore scm-specific file instead of every dot-file
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java
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/ScmPublishInventory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java?rev=1334493&r1=1334492&r2=1334493&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java Sat May 5 20:38:26 2012
@@ -43,31 +43,37 @@ import org.codehaus.jackson.map.MappingJ
*/
public class ScmPublishInventory
{
- private static class DotFilter
+ private static class IgnoreFilter
implements IOFileFilter
{
+ private final String ignoreFile;
+
+ public IgnoreFilter( String ignoreFile )
+ {
+ this.ignoreFile = ignoreFile;
+ }
public boolean accept( File file )
{
- return !file.getName().startsWith( "." );
+ return !file.getName().equals( ignoreFile );
}
public boolean accept( File dir, String name )
{
- return !name.startsWith( "." );
+ return !name.equals( ignoreFile );
}
}
- public static List<String> listInventory( File basedir )
+ public static List<String> listInventory( File basedir, String ignoreFile )
{
- return Arrays.asList( basedir.list( new DotFilter() ) );
+ return Arrays.asList( basedir.list( new IgnoreFilter( ignoreFile ) ) );
}
- public static List<File> listInventoryFiles( File basedir )
+ public static List<File> listInventoryFiles( File basedir, String ignoreFile )
{
List<File> inventory = new ArrayList<File>();
- inventory.addAll( FileUtils.listFiles( basedir, new DotFilter(), new DotFilter() ) );
+ inventory.addAll( FileUtils.listFiles( basedir, new IgnoreFilter( ignoreFile ), new IgnoreFilter( ignoreFile ) ) );
Collections.sort( inventory );
return inventory;
}
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java?rev=1334493&r1=1334492&r2=1334493&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventoryMojo.java Sat May 5 20:38:26 2012
@@ -71,7 +71,8 @@ public class ScmPublishInventoryMojo
{
checkoutExisting();
- List<File> inventory = ScmPublishInventory.listInventoryFiles( checkoutDirectory );
+ List<File> inventory =
+ ScmPublishInventory.listInventoryFiles( checkoutDirectory, scmProvider.getScmSpecificFilename() );
ScmPublishInventory.writeInventory( inventory, inventoryFile );
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=1334493&r1=1334492&r2=1334493&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 Sat May 5 20:38:26 2012
@@ -157,7 +157,8 @@ public class ScmPublishPublishMojo
List<File> inventory = ScmPublishInventory.readInventory( inventoryFile );
// what files are in stock now?
- Collection<File> newInventory = ScmPublishInventory.listInventoryFiles( checkoutDirectory );
+ Collection<File> newInventory =
+ ScmPublishInventory.listInventoryFiles( checkoutDirectory, scmProvider.getScmSpecificFilename() );
Set<File> deleted = new HashSet<File>( inventory );
deleted.removeAll( newInventory ); // old - new = deleted. (Added is the complete new inventory at this point.)
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=1334493&r1=1334492&r2=1334493&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 Sat May 5 20:38:26 2012
@@ -64,7 +64,8 @@ public class ScmPublishPublishScmMojo
private void update( File checkout, File dir )
throws IOException
{
- Set<String> checkoutContent = new HashSet<String>( ScmPublishInventory.listInventory( checkout ) );
+ Set<String> checkoutContent =
+ new HashSet<String>( ScmPublishInventory.listInventory( checkout, scmProvider.getScmSpecificFilename() ) );
List<String> dirContent = ( dir != null ) ? Arrays.asList( dir.list() ) : Collections.<String>emptyList();
Set<String> deleted = new HashSet<String>( checkoutContent );