You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/09 23:36:00 UTC
svn commit: r684353 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml
src/it/project-cloning/setup.bsh src/it/project-cloning/verify.bsh
src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Author: bentmann
Date: Sat Aug 9 14:35:59 2008
New Revision: 684353
URL: http://svn.apache.org/viewvc?rev=684353&view=rev
Log:
[MINVOKER-48] Project cloning does not retain empty directories
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh (with props)
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=684353&r1=684352&r2=684353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Aug 9 14:35:59 2008
@@ -151,6 +151,7 @@
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
+ <preBuildHookScript>setup.bsh</preBuildHookScript>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh?rev=684353&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh Sat Aug 9 14:35:59 2008
@@ -0,0 +1,16 @@
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+try
+{
+ File emptyDir = new File( basedir, "src/it/module-1/empty-dir" );
+ emptyDir.mkdirs();
+}
+catch( Throwable t )
+{
+ t.printStackTrace();
+ return false;
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/verify.bsh?rev=684353&r1=684352&r2=684353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning/verify.bsh Sat Aug 9 14:35:59 2008
@@ -17,6 +17,7 @@
"module/pom.xml",
"module-1",
"module-1/pom.xml",
+ "module-1/empty-dir",
"module-1/sub-module",
"module-1/sub-module/pom.xml",
};
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=684353&r1=684352&r2=684353&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java Sat Aug 9 14:35:59 2008
@@ -648,6 +648,12 @@
* NOTE: Make sure the destination directory is always there (even if empty) to support POM-less ITs.
*/
destDir.mkdirs();
+ String[] includedDirs = scanner.getIncludedDirectories();
+ for ( int i = 0; i < includedDirs.length; ++i )
+ {
+ File clonedDir = new File( destDir, includedDirs[i] );
+ clonedDir.mkdirs();
+ }
String[] includedFiles = scanner.getIncludedFiles();
for ( int i = 0; i < includedFiles.length; ++i )