You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/11/02 02:01:53 UTC
svn commit: r470154 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/main/java/org/apache/maven/plugin/assembly/archive/phase/
src/main/java/org/apache/maven/plugin/assembly/artifact/
src/main/java/org/apache/maven/plugin/assembly/filter/ src/ma...
Author: jdcasey
Date: Wed Nov 1 17:01:51 2006
New Revision: 470154
URL: http://svn.apache.org/viewvc?view=rev&rev=470154
Log:
Split out artifact filters and repository builder into separate projects for reuse elsewhere, and started using maven-test-tools over the original mock controls developed here.
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyExcludesArtifactFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/StatisticsReportingFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/repository/
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/DigestUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/AssemblyArtifactFilterTCK.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/AssemblyExcludesArtifactFilterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/AssemblyScopeArtifactFilterTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
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/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Nov 1 17:01:51 2006
@@ -316,8 +316,18 @@
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
+ <artifactId>maven-repository-builder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-test-tools</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- 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 Nov 1 17:01:51 2006
@@ -1,18 +1,26 @@
package org.apache.maven.plugin.assembly.archive.phase;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
+import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper;
import org.apache.maven.plugin.assembly.archive.task.AddDirectoryTask;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.repository.RepositoryAssembler;
-import org.apache.maven.plugin.assembly.repository.RepositoryAssemblyException;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugins.assembly.model.Assembly;
+import org.apache.maven.plugins.assembly.model.GroupVersionAlignment;
import org.apache.maven.plugins.assembly.model.Repository;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.repository.RepositoryAssembler;
+import org.apache.maven.shared.repository.RepositoryAssemblyException;
+import org.apache.maven.shared.repository.RepositoryBuilderConfigSource;
+import org.apache.maven.shared.repository.model.RepositoryInfo;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -61,7 +69,7 @@
try
{
- repositoryAssembler.assemble( repositoryDirectory, repository, configSource );
+ repositoryAssembler.buildRemoteRepository( repositoryDirectory, wrap( repository ), wrap( configSource ) );
}
catch ( RepositoryAssemblyException e )
{
@@ -83,4 +91,14 @@
}
}
+ private RepositoryBuilderConfigSource wrap( AssemblerConfigurationSource configSource )
+ {
+ return new RepoBuilderConfigSourceWrapper( configSource );
+ }
+
+ private RepositoryInfo wrap( Repository repository )
+ {
+ return new RepoInfoWrapper( repository );
+ }
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Wed Nov 1 17:01:51 2006
@@ -9,11 +9,11 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.plugin.assembly.filter.AssemblyScopeArtifactFilter;
import org.apache.maven.plugin.assembly.utils.FilterUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
+import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -72,7 +72,7 @@
{
List repos = aggregateRemoteArtifactRepositories( remoteRepositories, project );
- ArtifactFilter filter = new AssemblyScopeArtifactFilter( scope );
+ ArtifactFilter filter = new ScopeArtifactFilter( scope );
// TODO: such a call in MavenMetadataSource too - packaging not really the intention of type
Artifact artifact =
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java Wed Nov 1 17:01:51 2006
@@ -10,10 +10,10 @@
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.filter.AssemblyExcludesArtifactFilter;
-import org.apache.maven.plugin.assembly.filter.AssemblyIncludesArtifactFilter;
-import org.apache.maven.plugin.assembly.filter.StatisticsReportingFilter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
+import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
+import org.apache.maven.shared.artifact.filter.StatisticsReportingArtifactFilter;
import org.codehaus.plexus.logging.Logger;
public final class FilterUtils
@@ -32,7 +32,7 @@
if ( !includes.isEmpty() )
{
- AssemblyIncludesArtifactFilter includeFilter = new AssemblyIncludesArtifactFilter( includes,
+ PatternIncludesArtifactFilter includeFilter = new PatternIncludesArtifactFilter( includes,
actTransitively );
filter.add( includeFilter );
@@ -40,7 +40,7 @@
}
if ( !excludes.isEmpty() )
{
- AssemblyExcludesArtifactFilter excludeFilter = new AssemblyExcludesArtifactFilter( excludes,
+ PatternExcludesArtifactFilter excludeFilter = new PatternExcludesArtifactFilter( excludes,
actTransitively );
filter.add( excludeFilter );
@@ -62,9 +62,9 @@
{
ArtifactFilter f = (ArtifactFilter) it.next();
- if ( f instanceof StatisticsReportingFilter )
+ if ( f instanceof StatisticsReportingArtifactFilter )
{
- ( (StatisticsReportingFilter) f ).reportMissedCriteria( logger );
+ ( (StatisticsReportingArtifactFilter) f ).reportMissedCriteria( logger );
}
}
}
@@ -89,7 +89,7 @@
if ( !includes.isEmpty() )
{
- ArtifactFilter includeFilter = new AssemblyIncludesArtifactFilter( includes, actTransitively );
+ ArtifactFilter includeFilter = new PatternIncludesArtifactFilter( includes, actTransitively );
filter.add( includeFilter );
@@ -98,7 +98,7 @@
if ( !excludes.isEmpty() )
{
- ArtifactFilter excludeFilter = new AssemblyExcludesArtifactFilter( excludes, actTransitively );
+ ArtifactFilter excludeFilter = new PatternExcludesArtifactFilter( excludes, actTransitively );
filter.add( excludeFilter );
@@ -131,9 +131,9 @@
{
ArtifactFilter f = (ArtifactFilter) it.next();
- if ( f instanceof StatisticsReportingFilter )
+ if ( f instanceof StatisticsReportingArtifactFilter )
{
- StatisticsReportingFilter sFilter = (StatisticsReportingFilter) f;
+ StatisticsReportingArtifactFilter sFilter = (StatisticsReportingArtifactFilter) f;
if ( strictFiltering && sFilter.hasMissedCriteria() )
{
@@ -150,9 +150,9 @@
{
ArtifactFilter f = (ArtifactFilter) it.next();
- if ( f instanceof StatisticsReportingFilter )
+ if ( f instanceof StatisticsReportingArtifactFilter )
{
- StatisticsReportingFilter sFilter = (StatisticsReportingFilter) f;
+ StatisticsReportingArtifactFilter sFilter = (StatisticsReportingArtifactFilter) f;
if ( logger.isDebugEnabled() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Wed Nov 1 17:01:51 2006
@@ -251,6 +251,16 @@
]]>
</description>
</field>
+ <field>
+ <name>filtered</name>
+ <version>1.1.0</version>
+ <description>
+ Whether to filter symbols in the files as they are copied, using
+ properties from the build configuration.
+ </description>
+ <defaultValue>false</defaultValue>
+ <type>boolean</type>
+ </field>
</fields>
</class>
<class>
@@ -366,6 +376,17 @@
</description>
</field>
<field>
+ <name>unpackOptions</name>
+ <version>1.1.0</version>
+ <description>
+ Allows the specification of includes and excludes, along with filtering options, for items
+ unpacked from a dependency artifact.
+ </description>
+ <association>
+ <type>UnpackOptions</type>
+ </association>
+ </field>
+ <field>
<name>scope</name>
<version>1.0.0+</version>
<type>String</type>
@@ -443,6 +464,47 @@
<type>String</type>
<multiplicity>*</multiplicity>
</association>
+ </field>
+ </fields>
+ </class>
+ <class>
+ <name>UnpackOptions</name>
+ <version>1.1.0</version>
+ <description>
+ Specifies options for including/excluding/filtering items extracted from an archive.
+ </description>
+ <fields>
+ <field>
+ <name>includes</name>
+ <version>1.1.0</version>
+ <description>
+ Set of patterns for matching items to be included from an archive as it is unpacked.
+ </description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>excludes</name>
+ <version>1.1.0</version>
+ <description>
+ Set of patterns for matching items to be excluded from an archive as it is unpacked.
+ </description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>filtered</name>
+ <version>1.1.0</version>
+ <description>
+ Whether to filter symbols in the files as they are unpacked from the archive, using
+ properties from the build configuration.
+ </description>
+ <defaultValue>false</defaultValue>
+ <type>boolean</type>
</field>
</fields>
</class>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Wed Nov 1 17:01:51 2006
@@ -369,6 +369,16 @@
]]>
</description>
</field>
+ <field>
+ <name>filtered</name>
+ <version>1.1.0</version>
+ <description>
+ Whether to filter symbols in the files as they are copied, using
+ properties from the build configuration.
+ </description>
+ <defaultValue>false</defaultValue>
+ <type>boolean</type>
+ </field>
</fields>
</class>
<class>
@@ -474,6 +484,7 @@
</field>
<field>
<name>unpack</name>
+ <version>1.0.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -484,6 +495,17 @@
</description>
</field>
<field>
+ <name>unpackOptions</name>
+ <version>1.1.0</version>
+ <description>
+ Allows the specification of includes and excludes, along with filtering options, for items
+ unpacked from a dependency artifact.
+ </description>
+ <association>
+ <type>UnpackOptions</type>
+ </association>
+ </field>
+ <field>
<name>scope</name>
<version>1.0.0+</version>
<type>String</type>
@@ -691,6 +713,7 @@
</field>
<field>
<name>unpack</name>
+ <version>1.0.0+</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -701,6 +724,17 @@
</description>
</field>
<field>
+ <name>unpackOptions</name>
+ <version>1.1.0</version>
+ <description>
+ Allows the specification of includes and excludes, along with filtering options, for items
+ unpacked from a module artifact.
+ </description>
+ <association>
+ <type>UnpackOptions</type>
+ </association>
+ </field>
+ <field>
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>
@@ -809,6 +843,47 @@
<type>String</type>
<multiplicity>*</multiplicity>
</association>
+ </field>
+ </fields>
+ </class>
+ <class>
+ <name>UnpackOptions</name>
+ <version>1.1.0</version>
+ <description>
+ Specifies options for including/excluding/filtering items extracted from an archive.
+ </description>
+ <fields>
+ <field>
+ <name>includes</name>
+ <version>1.1.0</version>
+ <description>
+ Set of patterns for matching items to be included from an archive as it is unpacked.
+ </description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>excludes</name>
+ <version>1.1.0</version>
+ <description>
+ Set of patterns for matching items to be excluded from an archive as it is unpacked.
+ </description>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>filtered</name>
+ <version>1.1.0</version>
+ <description>
+ Whether to filter symbols in the files as they are unpacked from the archive, using
+ properties from the build configuration.
+ </description>
+ <defaultValue>false</defaultValue>
+ <type>boolean</type>
</field>
</fields>
</class>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AllTests.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AllTests.java?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AllTests.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AllTests.java Wed Nov 1 17:01:51 2006
@@ -11,9 +11,6 @@
import org.apache.maven.plugin.assembly.archive.task.AddDependencySetsTaskTest;
import org.apache.maven.plugin.assembly.archive.task.AddDirectoryTaskTest;
import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTaskTest;
-import org.apache.maven.plugin.assembly.filter.AssemblyExcludesArtifactFilterTest;
-import org.apache.maven.plugin.assembly.filter.AssemblyIncludesArtifactFilterTest;
-import org.apache.maven.plugin.assembly.filter.AssemblyScopeArtifactFilterTest;
import org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilterTest;
import org.apache.maven.plugin.assembly.format.FileFormatterTest;
import org.apache.maven.plugin.assembly.format.FileSetFormatterTest;
@@ -47,10 +44,7 @@
suite.addTestSuite( AddFileSetsTaskTest.class );
suite.addTestSuite( DefaultAssemblyArchiverTest.class );
suite.addTestSuite( ManifestCreationFinalizerTest.class );
- suite.addTestSuite( AssemblyIncludesArtifactFilterTest.class );
- suite.addTestSuite( AssemblyExcludesArtifactFilterTest.class );
suite.addTestSuite( ComponentsXmlArchiverFileFilterTest.class );
- suite.addTestSuite( AssemblyScopeArtifactFilterTest.class );
suite.addTestSuite( FileFormatterTest.class );
suite.addTestSuite( FileSetFormatterTest.class );
suite.addTestSuite( AssemblyInterpolatorTest.class );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Wed Nov 1 17:01:51 2006
@@ -851,8 +851,8 @@
macArtifacts.add( addArtifact( project2, mm, true, false ) );
( (MockAndControlForArtifact) macArtifacts.get( 1 ) ).expectGetId( "group:artifact2:jar:version" );
- ( (MockAndControlForArtifact) macArtifacts.get( 1 ) ).expectGetDependencyTrail( Collections
- .singletonList( "group:artifact:jar:version" ) );
+// ( (MockAndControlForArtifact) macArtifacts.get( 1 ) ).expectGetDependencyTrail( Collections
+// .singletonList( "group:artifact:jar:version" ) );
MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
macArtifacts.add( addArtifact( project3, mm, true, true ) );
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?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- 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 Nov 1 17:01:51 2006
@@ -3,14 +3,16 @@
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
+import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.repository.RepositoryAssembler;
-import org.apache.maven.plugin.assembly.repository.RepositoryAssemblyException;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.Repository;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.repository.RepositoryAssembler;
+import org.apache.maven.shared.repository.RepositoryAssemblyException;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
@@ -234,7 +236,8 @@
{
try
{
- repositoryAssembler.assemble( dir, repo, configSource );
+ repositoryAssembler.buildRemoteRepository( dir, new RepoInfoWrapper( repo ), new RepoBuilderConfigSourceWrapper( configSource ) );
+ control.setMatcher( MockControl.ALWAYS_MATCHER );
}
catch ( RepositoryAssemblyException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?view=diff&rev=470154&r1=470153&r2=470154
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java Wed Nov 1 17:01:51 2006
@@ -165,7 +165,7 @@
mac.expectGetGroupId( "group" );
mac.expectGetArtifactId( "artifact" );
mac.expectGetDependencyConflictId( "group:artifact:jar" );
- mac.expectGetDependencyTrail( Collections.EMPTY_LIST );
+ mac.expectGetId( "group:artifact:1.0" );
artifacts.add( mac.artifact );