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 2010/09/28 20:13:45 UTC
svn commit: r1002307 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/
src/it/projects/multimodule/multimodule-siblingParent/parent/
src/main/java/org/apache/maven/plugin/assembly/archive...
Author: jdcasey
Date: Tue Sep 28 18:13:44 2010
New Revision: 1002307
URL: http://svn.apache.org/viewvc?rev=1002307&view=rev
Log:
[MASSEMBLY-507] Restore use of javadoc annotations for plexus components, since generated descriptors based on Java5 annotations seem not to be compatible with Maven 2.x.
Also, fixing test properties and verification script for two failing ITs.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
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/filter/MetaInfServicesHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Sep 28 18:13:44 2010
@@ -119,17 +119,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-active-collections</artifactId>
- <version>1.0-beta-2</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>1.0.1</version>
<exclusions>
@@ -205,40 +194,47 @@ under the License.
<version>4.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>1.5.4</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/generated-resources/plexus</directory>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.5.4</version>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
<executions>
<execution>
<id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>generate-metadata</goal>
+ <goal>descriptor</goal>
</goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-resources/plexus</outputDirectory>
+ </configuration>
</execution>
<execution>
<id>merge-metadata</id>
- <configuration>
- <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
- <descriptors>
- <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
- <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
- </descriptors>
- </configuration>
+ <phase>process-resources</phase>
<goals>
- <goal>merge-metadata</goal>
+ <goal>merge-descriptors</goal>
</goals>
+ <configuration>
+ <!-- <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> -->
+ <!-- <resources>
+ <resource>${project.build.outputDirectory}/META-INF/plexus/components.xml</resource>
+ <resource>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</resource>
+ </resources> -->
+ </configuration>
</execution>
</executions>
</plugin>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties Tue Sep 28 18:13:44 2010
@@ -1 +1 @@
-skipAssembly=true
\ No newline at end of file
+assembly.skipAssembly=true
\ No newline at end of file
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-siblingParent/parent/verify.bsh Tue Sep 28 18:13:44 2010
@@ -4,6 +4,6 @@ boolean result = true;
result = result && new File( basedir, "target/parent-1-src/sources/child1/pom.xml" ).exists();
-result = result && !new File( basedir, "target/parent-1-src/sources/child2/pom.xml" ).exists();
+result = result && new File( basedir, "target/parent-1-src/sources/child2/pom.xml" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Tue Sep 28 18:13:44 2010
@@ -48,8 +48,6 @@ import org.codehaus.plexus.archiver.mana
import org.codehaus.plexus.archiver.tar.TarArchiver;
import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.codehaus.plexus.archiver.war.WarArchiver;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
@@ -83,23 +81,31 @@ import java.util.Map;
* activities.
*
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.AssemblyArchiver"
*/
-@Component( role = AssemblyArchiver.class )
public class DefaultAssemblyArchiver
extends AbstractLogEnabled
implements AssemblyArchiver, Contextualizable
{
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArchiverManager archiverManager;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private DependencyResolver dependencyResolver;
- @Requirement( role = AssemblyArchiverPhase.class )
+ /**
+ * @plexus.requirement role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase"
+ */
private List<AssemblyArchiverPhase> assemblyPhases;
- @Requirement( role = ContainerDescriptorHandler.class )
+ /**
+ * @plexus.requirement role="org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler"
+ */
private Map<String, ContainerDescriptorHandler> containerDescriptorHandlers;
private PlexusContainer container;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java Tue Sep 28 18:13:44 2010
@@ -29,8 +29,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.project.MavenProjectBuilder;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -38,17 +36,22 @@ import org.codehaus.plexus.logging.Logge
* Handles the top-level <dependencySets/> section of the assembly descriptor.
*
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase"
+ * role-hint="dependency-sets"
*/
-@Component( role = AssemblyArchiverPhase.class, hint = "dependency-sets" )
public class DependencySetAssemblyPhase
extends AbstractLogEnabled
implements AssemblyArchiverPhase
{
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private MavenProjectBuilder projectBuilder;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArchiverManager archiverManager;
public DependencySetAssemblyPhase()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java Tue Sep 28 18:13:44 2010
@@ -30,7 +30,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
@@ -41,8 +40,8 @@ import java.util.List;
* Handles the top-level <files/> section of the assembly descriptor.
*
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase" role-hint="file-items"
*/
-@Component( role = AssemblyArchiverPhase.class, hint = "file-items" )
public class FileItemAssemblyPhase
extends AbstractLogEnabled
implements AssemblyArchiverPhase
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java Tue Sep 28 18:13:44 2010
@@ -27,7 +27,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.FileSet;
import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.List;
@@ -36,8 +35,8 @@ import java.util.List;
* Handles the <fileSets/> top-level section of the assembly descriptor.
*
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase" role-hint="file-sets"
*/
-@Component( role = AssemblyArchiverPhase.class, hint = "file-sets" )
public class FileSetAssemblyPhase
extends AbstractLogEnabled
implements AssemblyArchiverPhase
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Tue Sep 28 18:13:44 2010
@@ -43,8 +43,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.MavenProjectBuilder;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -63,17 +61,21 @@ import java.util.Set;
* Handles the <moduleSets/> top-level section of the assembly descriptor.
*
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase" role-hint="module-sets"
*/
-@Component( role = AssemblyArchiverPhase.class, hint = "module-sets" )
public class ModuleSetAssemblyPhase
extends AbstractLogEnabled
implements AssemblyArchiverPhase
{
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private MavenProjectBuilder projectBuilder;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArchiverManager archiverManager;
public ModuleSetAssemblyPhase()
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=1002307&r1=1002306&r2=1002307&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 Tue Sep 28 18:13:44 2010
@@ -36,8 +36,6 @@ import org.apache.maven.shared.repositor
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.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
@@ -46,14 +44,17 @@ import java.util.List;
/**
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase"
+ * role-hint="repositories"
*/
-@Component( role = AssemblyArchiverPhase.class, hint = "repositories" )
public class RepositoryAssemblyPhase
extends AbstractLogEnabled
implements AssemblyArchiverPhase
{
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private RepositoryAssembler repositoryAssembler;
public RepositoryAssemblyPhase()
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?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- 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 Tue Sep 28 18:13:44 2010
@@ -42,8 +42,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.utils.FilterUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
@@ -59,23 +57,31 @@ import java.util.Set;
/**
* @author jdcasey
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.artifact.DependencyResolver"
*/
-@Component( role = DependencyResolver.class )
public class DefaultDependencyResolver
extends AbstractLogEnabled
implements DependencyResolver
{
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArtifactResolver resolver;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArtifactMetadataSource metadataSource;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArtifactFactory factory;
- @Requirement
+ /**
+ * @plexus.requirement
+ */
private ArtifactCollector collector;
public DefaultDependencyResolver()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java Tue Sep 28 18:13:44 2010
@@ -19,10 +19,12 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-services" )
+/**
+ * @plexus.component role="org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler"
+ * role-hint="metaInf-services"
+ */
public class MetaInfServicesHandler
extends AbstractLineAggregatingHandler
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java Tue Sep 28 18:13:44 2010
@@ -19,10 +19,12 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-@Component( role = ContainerDescriptorHandler.class, hint = "metaInf-spring" )
+/**
+ * @plexus.component role="org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler"
+ * role-hint="metaInf-spring"
+ */
public class MetaInfSpringHandler
extends AbstractLineAggregatingHandler
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Tue Sep 28 18:13:44 2010
@@ -69,8 +69,8 @@ import java.util.Set;
/**
* @version $Id$
+ * @plexus.component role="org.apache.maven.plugin.assembly.io.AssemblyReader"
*/
-@org.codehaus.plexus.component.annotations.Component( role = AssemblyReader.class )
public class DefaultAssemblyReader
extends AbstractLogEnabled
implements AssemblyReader
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java?rev=1002307&r1=1002306&r2=1002307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java Tue Sep 28 18:13:44 2010
@@ -139,7 +139,7 @@ public class AssemblyProxyArchiverTest
final Archiver delegate = new JarArchiver();
final File output = fileManager.createTempFile();
-
+
delegate.setDestFile( output );
final CounterSelector counter = new CounterSelector( true );
@@ -185,6 +185,7 @@ public class AssemblyProxyArchiverTest
if ( fileInfo.isFile() )
{
count++;
+ System.out.println( "Counting file: " + fileInfo.getName() + ". Current count: " + count );
}
return answer;