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 2009/05/01 21:16:32 UTC
svn commit: r770795 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule: two-levels-includeBaseDir-withBin/ two-levels-includeBaseDir-withBin/child-level1-project1/ two-levels-includeBaseDir-withBin/child-level1-project2/ two-le...

Author: bentmann
Date: Fri May  1 19:16:32 2009
New Revision: 770795

URL: http://svn.apache.org/viewvc?rev=770795&view=rev
Log:
o Shortended path names for easier working on Windows

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/
      - copied from r770402, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/
      - copied from r770402, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/
Removed:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/
Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml Fri May  1 19:16:32 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0"?><project>
   <parent>
     <groupId>test</groupId>
-    <artifactId>two-levels-includeBaseDirectory-withBinaries</artifactId>
+    <artifactId>two-levels-includeBaseDir-withBin</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml Fri May  1 19:16:32 2009
@@ -2,7 +2,7 @@
 <project>
   <parent>
     <groupId>test</groupId>
-    <artifactId>two-levels-includeBaseDirectory-withBinaries</artifactId>
+    <artifactId>two-levels-includeBaseDir-withBin</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/pom.xml Fri May  1 19:16:32 2009
@@ -8,7 +8,7 @@
   </parent>
   
   <groupId>test</groupId>
-  <artifactId>two-levels-includeBaseDirectory-withBinaries</artifactId>
+  <artifactId>two-levels-includeBaseDir-withBin</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh Fri May  1 19:16:32 2009
@@ -2,7 +2,7 @@
 
 boolean result = true;
 
-String finalName = "two-levels-includeBaseDirectory-withBinaries-1.0-SNAPSHOT";
+String finalName = "two-levels-includeBaseDir-withBin-1.0-SNAPSHOT";
 String rootDir = "target/" + finalName + "-bin/" + finalName + "/modules/";
 
 result = result && new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists();   

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml Fri May  1 19:16:32 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0"?><project>
   <parent>
     <groupId>test</groupId>
-    <artifactId>two-levels-includeBaseDirectory-withSources</artifactId>
+    <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml Fri May  1 19:16:32 2009
@@ -2,7 +2,7 @@
 <project>
   <parent>
     <groupId>test</groupId>
-    <artifactId>two-levels-includeBaseDirectory-withSources</artifactId>
+    <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/pom.xml Fri May  1 19:16:32 2009
@@ -8,7 +8,7 @@
   </parent>
   
   <groupId>test</groupId>
-  <artifactId>two-levels-includeBaseDirectory-withSources</artifactId>
+  <artifactId>two-levels-includeBaseDir-withSrc</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh?rev=770795&r1=770402&r2=770795&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh Fri May  1 19:16:32 2009
@@ -4,7 +4,7 @@
 
 boolean result = true;
 
-String finalName = "two-levels-includeBaseDirectory-withSources-1.0-SNAPSHOT";
+String finalName = "two-levels-includeBaseDir-withSrc-1.0-SNAPSHOT";
 String rootDir = "target/" + finalName + "-src/" + finalName + "/modules/";
 
 result = result && new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists();