Author: jdcasey
Date: Wed Aug 23 05:55:14 2006
New Revision: 434035
URL: http://svn.apache.org/viewvc?rev=434035&view=rev
Log:
Adding assembly:single mojo tests.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/it/integration-tests.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/test.rb
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>single-in-one-project-hierarchy</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,15 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/verify.bsh?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-in-one-project-hierarchy/verify.bsh
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,3 @@
+import java.io.File;
+
+return new File( basedir,
"target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin.dir/lib/junit.jar"
).exists();
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,15 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,15 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>single-twice-in-multimodule-hierarchy</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,8 @@
+import java.io.File;
+
+boolean result = true;
+
+result = result && new File( basedir,
"child1/target/child1-1.0-SNAPSHOT-bin.dir/lib/junit.jar" ).exists();
+result = result && new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-bin.dir/lib/junit.jar" ).exists();
+
+return result;
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>single-in-one-project-hierarchy</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>first-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>first</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>second-assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <finalName>second</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,15 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh?rev=434035&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
Wed Aug 23 05:55:14 2006
@@ -0,0 +1,8 @@
+import java.io.File;
+
+boolean result = true;
+
+result = result && new File( basedir, "target/first-bin.dir/lib/junit.jar"
).exists();
+result = result && new File( basedir, "target/second-bin.dir/lib/junit.jar"
).exists();
+
+return result;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=434035&r1=434034&r2=434035&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Wed Aug 23 05:55:14 2006
@@ -52,7 +52,7 @@
{
Repository repository = (Repository) i.next();
- File repositoryDirectory = new File( tempRoot, "repositories/" +
repository.getOutputDirectory() );
+ File repositoryDirectory = new File( tempRoot,
repository.getOutputDirectory() );
if ( !repositoryDirectory.exists() )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=434035&r1=434034&r2=434035&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
Wed Aug 23 05:55:14 2006
@@ -82,13 +82,13 @@
Repository repo = new Repository();
- repo.setOutputDirectory( "/out" );
+ repo.setOutputDirectory( "out" );
repo.setDirectoryMode( "777" );
repo.setFileMode( "777" );
int mode = Integer.parseInt( "777", 8 );
- File outDir = new File( tempRoot, "repositories/out" );
+ File outDir = new File( tempRoot, "out" );
macArchiver.expectModeChange( -1, -1, mode, mode, true );
macArchiver.expectAddDirectory( outDir, "final-name/out/", null, new
String[0] );
