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/01/14 01:02:04 UTC

svn commit: r1231414 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs: setup.bsh verify.bsh verify.groovy

Author: hboutemy
Date: Sat Jan 14 00:02:03 2012
New Revision: 1231414

URL: http://svn.apache.org/viewvc?rev=1231414&view=rev
Log:
fixed inefficient IT: .svn directory was simply not copied in clone IT dir

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh   (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy   (contents, props changed)
      - copied, changed from r1231322, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh
Removed:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh?rev=1231414&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh Sat Jan 14 00:02:03 2012
@@ -0,0 +1,13 @@
+import java.io.*;
+
+File srcSvnDir = new File( basedir, "src/main/assembly/.svn" );
+srcSvnDir.mkdirs();
+
+File srcSvnFile = new File( srcSvnDir, "entries" );
+
+FileWriter writer = new FileWriter( srcSvnFile );
+writer.write( "Test, Test" );
+writer.flush();
+writer.close();
+
+return true;
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/setup.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy (from r1231322, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy?p2=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy&p1=maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh&r1=1231322&r2=1231414&rev=1231414&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy Sat Jan 14 00:02:03 2012
@@ -1,10 +1,8 @@
-import java.io.*;
+assert new File( basedir, "src/main/assembly/.svn" ).exists();
 
-boolean result = true;
+File assemblyDir = new File( basedir, "target/excluding-svn-dirs-1.0-SNAPSHOT-src/src/main/assembly" );
 
-String assemblyDir = "target/excluding-svn-dirs-1.0-SNAPSHOT-src/src/main/assembly/";
+assert new File( assemblyDir, "src.xml" ).exists();
+assert !new File( assemblyDir, ".svn" ).exists();
 
-result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
-result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
-
-return result;
+return true;

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native