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 2007/07/18 03:07:30 UTC
svn commit: r557108 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
archive/DefaultAssemblyArchiver.java
archive/archiver/PrefixingProxyArchiver.java
filter/SimpleAggregatingDescriptorHandler.java
Author: jdcasey
Date: Tue Jul 17 18:07:29 2007
New Revision: 557108
URL: http://svn.apache.org/viewvc?view=rev&rev=557108
Log:
Cleaning up debug statements.
Modified:
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/archiver/PrefixingProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
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?view=diff&rev=557108&r1=557107&r2=557108
==============================================================================
--- 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 Jul 17 18:07:29 2007
@@ -11,6 +11,8 @@
import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.filters.JarSecurityFileSelector;
@@ -21,9 +23,11 @@
import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.codehaus.plexus.archiver.war.WarArchiver;
import org.codehaus.plexus.collections.ActiveCollectionManager;
-import org.codehaus.plexus.collections.ActiveMap;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import java.io.File;
import java.io.IOException;
@@ -37,7 +41,7 @@
*/
public class DefaultAssemblyArchiver
extends AbstractLogEnabled
- implements AssemblyArchiver
+ implements AssemblyArchiver, Contextualizable
{
/**
@@ -50,10 +54,12 @@
*/
private List assemblyPhases;
- /**
- * @plexus.requirement
- */
- private ActiveCollectionManager collectionManager;
+// /**
+// * @plexus.requirement
+// */
+// private ActiveCollectionManager collectionManager;
+
+ private PlexusContainer container;
public DefaultAssemblyArchiver()
{
@@ -64,7 +70,7 @@
public DefaultAssemblyArchiver( ArchiverManager archiverManager, ActiveCollectionManager collectionManager, List assemblyPhases )
{
this.archiverManager = archiverManager;
- this.collectionManager = collectionManager;
+// this.collectionManager = collectionManager;
this.assemblyPhases = assemblyPhases;
}
@@ -138,7 +144,7 @@
if ( ( containerDescriptorHandlers != null ) && !containerDescriptorHandlers.isEmpty() )
{
- ActiveMap handlerMap = collectionManager.getActiveMap( ContainerDescriptorHandler.class );
+// ActiveMap handlerMap = collectionManager.getActiveMap( ContainerDescriptorHandler.class );
for ( Iterator it = containerDescriptorHandlers.iterator(); it.hasNext(); )
{
@@ -149,13 +155,17 @@
try
{
- handler = (ContainerDescriptorHandler) handlerMap.checkedGet( hint );
+ handler = (ContainerDescriptorHandler) container.lookup( ContainerDescriptorHandler.class.getName(), hint );
+// handler = (ContainerDescriptorHandler) handlerMap.checkedGet( hint );
}
catch ( ComponentLookupException e )
{
+ getLogger().debug( "Failed to load container descriptor handler: " + hint, e );
throw new InvalidAssemblerConfigurationException( "containerDescriptorHandler: " + hint + " could not be loaded.", e );
}
+ System.out.println( "Loaded container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
+
handlers.add( handler );
if ( "plexus".equals( hint ) )
@@ -275,6 +285,12 @@
tarArchiver.setLongfile( tarFileMode );
return tarArchiver;
+ }
+
+ public void contextualize( Context context )
+ throws ContextException
+ {
+ container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java?view=diff&rev=557108&r1=557107&r2=557108
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixingProxyArchiver.java Tue Jul 17 18:07:29 2007
@@ -511,9 +511,11 @@
for ( int i = 0; i < selectors.length; i++ )
{
+ FileSelector selector = selectors[i];
+
try
{
- if ( !selectors[i].isSelected( fileInfo ) )
+ if ( !selector.isSelected( fileInfo ) )
{
return false;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?view=diff&rev=557108&r1=557107&r2=557108
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Tue Jul 17 18:07:29 2007
@@ -122,7 +122,6 @@
public boolean isSelected( FileInfo fileInfo )
throws IOException
{
- System.out.println( "\n\nChecking isSelected(..) for file with name: " + fileInfo.getName() + "\nin: " + getClass().getName() + "\n\n" );
if ( overrideFilterAction )
{
System.out.println( "Filtering overridden. Returning true." );
@@ -133,14 +132,12 @@
if ( fileInfo.isFile() && name.matches( filePattern ) )
{
- System.out.println( "File is filtered. Processing, and returning false to suppress original file's inclusion." );
readProperties( fileInfo );
filenames.add( name );
return false;
}
- System.out.println( "File does not match filter pattern. Return true to allow its inclusion as-is." );
return true;
}