Author: epunzalan
Date: Wed May 10 03:45:46 2006
New Revision: 405711
URL: http://svn.apache.org/viewcvs?rev=405711&view=rev
Log:
PR: MASSEMBLY-88
Updated the pom to require 2.0.4 for the repository to work.
Finished moduleSet test cases and added a repository test case
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=405711&r1=405710&r2=405711&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed May 10 03:45:46 2006
@@ -9,6 +9,9 @@
<packaging>maven-plugin</packaging>
<name>Maven Assembly Plugin</name>
<version>2.1-SNAPSHOT</version>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
<build>
<plugins>
<plugin>
@@ -60,22 +63,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
<!-- XXX: A bug in Maven 2.0.4 means this will block necessary
dependencies coming through the testing harness -->
<exclusions>
<exclusion>
@@ -97,7 +100,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=405711&r1=405710&r2=405711&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
Wed May 10 03:45:46 2006
@@ -588,6 +588,8 @@
mojo.execute();
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
@@ -629,6 +631,8 @@
mojo.execute();
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
@@ -666,6 +670,8 @@
mojo.execute();
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
@@ -701,6 +707,8 @@
mojo.execute();
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
@@ -722,6 +730,111 @@
}
assertEquals( "Test that there are no other archive files added", 0,
archiverFiles.size() );
+ }
+
+ public void testModuleSetPacked()
+ throws Exception
+ {
+ ReactorMavenProjectStub.reactorProjects.clear();
+
+ AssemblyMojo mojo = getMojo( "moduleSet-packed-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ assertFalse( "Test if work directory is used", workDir.exists() );
+ File reactorProjectFile = reactorProject.getArtifact().getFile();
+ assertNotNull( "Test if reactor project is in the archive",
archiverFiles.remove( reactorProjectFile ) );
+ Artifact artifact = (Artifact)
reactorProject.getArtifacts().iterator().next();
+ File depFile = artifact.getFile();
+ assertNull( "Test if reactor dependency is not in the archive",
archiverFiles.remove( depFile ) );
+ }
+
+ assertTrue( "Test that there are no other archive files added",
archiverFiles.isEmpty() );
+ }
+
+ public void testModuleSetPackedIncludingDependencies()
+ throws Exception
+ {
+ ReactorMavenProjectStub.reactorProjects.clear();
+
+ AssemblyMojo mojo = getMojo(
"moduleSet-packed-including-dependencies-plugin-config.xml" );
+
+ MavenProject project = (MavenProject) getVariableValueFromObject(
mojo, "executedProject" );
+
+ List reactorProjectsList = (List) getVariableValueFromObject( mojo,
"reactorProjects" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ reactorProject.setParent( project );
+ }
+
+ mojo.execute();
+
+ assertTrue( "Test an archive was created",
ArchiverManagerStub.archiverStub.getDestFile().exists() );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ File workDir = (File) getVariableValueFromObject( mojo,
"workDirectory" );
+
+ for ( Iterator reactorProjects = reactorProjectsList.iterator();
reactorProjects.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject)
reactorProjects.next();
+
+ assertFalse( "Test if work directory is used", workDir.exists() );
+ File reactorProjectFile = reactorProject.getArtifact().getFile();
+ assertNotNull( "Test if reactor project is in the archive",
archiverFiles.remove( reactorProjectFile ) );
+ Artifact artifact = (Artifact)
reactorProject.getArtifacts().iterator().next();
+ File depFile = artifact.getFile();
+ assertNotNull( "Test if reactor dependency is also in the
archive", archiverFiles.remove( depFile ) );
+ }
+
+ assertTrue( "Test that there are no other archive files added",
archiverFiles.isEmpty() );
+ }
+
+ public void testRepository()
+ throws Exception
+ {
+ AssemblyMojo mojo = executeMojo( "repository-plugin-config.xml" );
+
+ File tempRoot = (File) getVariableValueFromObject( mojo, "tempRoot" );
+
+ File tmpRepositoryDir = new File( tempRoot, "repository" );
+ assertTrue( "Test if repository output directory is used",
tmpRepositoryDir.exists() );
+
+ String repoPath =
"assembly/dependency-artifact/1.0/dependency-artifact-1.0.";
+
+ File tmpArtifactJar = new File( tmpRepositoryDir, repoPath + "jar" );
+ assertTrue( "Test if dependency artifact is in repository",
tmpArtifactJar.exists() );
+ assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir,
repoPath + "jar.md5" ).exists() );
+ assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir,
repoPath + "jar.sha1" ).exists() );
+
+ File tmpArtifactPom = new File( tmpRepositoryDir, repoPath + "pom" );
+ assertTrue( "Test if dependency artifact is in repository",
tmpArtifactPom.exists() );
+ assertTrue( "Test if md5 was generated", new File( tmpRepositoryDir,
repoPath + "pom.md5" ).exists() );
+ assertTrue( "Test if sha1 was generated", new File( tmpRepositoryDir,
repoPath + "pom.sha1" ).exists() );
}
private AssemblyMojo getMojo( String pluginXml )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java?rev=405711&r1=405710&r2=405711&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/BasicAbstractAssemblyMojoFeaturesTest.java
Wed May 10 03:45:46 2006
@@ -680,5 +680,8 @@
return 0;
}
+ public void setOptional( boolean optional )
+ {
+ }
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java?rev=405711&r1=405710&r2=405711&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
Wed May 10 03:45:46 2006
@@ -18,12 +18,20 @@
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Model;
import org.apache.maven.model.Build;
+import org.codehaus.plexus.PlexusTestCase;
import java.util.Set;
import java.util.Collections;
import java.util.Properties;
+import java.util.List;
import java.io.File;
/**
@@ -47,6 +55,15 @@
return model.getBuild();
}
+ public List getRemoteArtifactRepositories()
+ {
+ ArtifactRepository repository = new DefaultArtifactRepository(
"test-central",
+ "file://" +
PlexusTestCase.getBasedir() + "/src/test/remote-repo",
+ new DefaultRepositoryLayout() );
+
+ return Collections.singletonList( repository );
+ }
+
public AssemblyMavenProjectStub()
{
groupId = "assembly";
@@ -54,6 +71,14 @@
version = "1.0";
}
+ public Set getDependencyArtifacts()
+ {
+ return Collections.singleton(
+ new DefaultArtifact( "assembly", "dependency-artifact",
VersionRange.createFromVersion( "1.0" ),
+ Artifact.SCOPE_COMPILE, "jar", null, new
DefaultArtifactHandler( "jar" ), false )
+ );
+ }
+
public File getBasedir()
{
return basedir;
@@ -63,7 +88,7 @@
{
if ( artifact == null )
{
- artifact = new ArtifactStub( groupId, artifactId, version, "jar",
null );
+ artifact = new ArtifactStub( groupId, artifactId, version, "jar",
Artifact.SCOPE_COMPILE );
}
return artifact;
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,49 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies</basedir>
+ </executedProject>
+ <descriptorRefs>
+
<descriptorRef>moduleSet-packed-including-dependencies</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed-including-dependencies/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-including-dependencies-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,50 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ <reactorProject
implementation="org.apache.maven.plugin.assembly.stubs.ReactorMavenProjectStub"/>
+ </reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub">
+
<basedir>${basedir}/target/test-harness/assembly/moduleSet-packed</basedir>
+ </executedProject>
+ <descriptorRefs>
+ <descriptorRef>moduleSet-packed</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/moduleSet-packed/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/moduleSet-packed/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/moduleSet-packed-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,45 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-harness/assembly/repository/target</outputDirectory>
+ <finalName>assembly</finalName>
+
<workDirectory>${basedir}/target/test-harness/assembly/repository/work</workDirectory>
+ <archiverManager
implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <executedProject
implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub"
/>
+ <descriptorRefs>
+ <descriptorRef>repository</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+
<tempRoot>${basedir}/target/test-harness/assembly/repository/archive-tmp</tempRoot>
+
<siteDirectory>${basedir}/target/test-harness/assembly/repository/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/repository-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.jar
Wed May 10 03:45:46 2006
@@ -0,0 +1 @@
+jar contents
\ No newline at end of file
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
Wed May 10 03:45:46 2006
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>assembly</groupId>
+ <artifactId>dependency-artifact</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/remote-repo/assembly/dependency-artifact/1.0/dependency-artifact-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <binaries>
+ <unpack>false</unpack>
+ <includeDependencies>true</includeDependencies>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed-including-dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,29 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>moduleSet</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <binaries>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/moduleSet-packed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml?rev=405711&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml
Wed May 10 03:45:46 2006
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>repositories</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <repositories>
+ <repository>
+ <outputDirectory>repository</outputDirectory>
+ </repository>
+ </repositories>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
