You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/09/12 05:07:25 UTC

svn commit: r442431 [1/2] - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ main/java/org/apache/maven/report/projectinfo/dependencies/ main/java/org/apache/maven/report/projectinfo/dependen...

Author: brett
Date: Mon Sep 11 20:07:24 2006
New Revision: 442431

URL: http://svn.apache.org/viewvc?view=rev&rev=442431
Log:
[MPIR-56] refactor dependency code out of single report class
Submitted by: Pete Marvin King

Added:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java   (with props)
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java   (with props)
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java   (with props)
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListener.java
      - copied, changed from r442415, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ReportResolutionListener.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java   (with props)
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java   (with props)
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/dependencies/
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListenerTest.java
      - copied, changed from r442415, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ReportResolutionListenerTest.java
Removed:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ReportResolutionListener.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ReportResolutionListenerTest.java
Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?view=diff&rev=442431&r1=442430&r2=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Mon Sep 11 20:07:24 2006
@@ -16,60 +16,28 @@
  * limitations under the License.
  */
 
-import java.io.File;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.resolver.ArtifactCollector;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.License;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.report.projectinfo.ReportResolutionListener.Node;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
-import org.apache.maven.settings.Proxy;
+import org.apache.maven.report.projectinfo.dependencies.Dependencies;
+import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration;
+import org.apache.maven.report.projectinfo.dependencies.ReportResolutionListener;
+import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
+import org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRenderer;
 import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.jar.Jar;
-import org.apache.maven.shared.jar.JarException;
-import org.apache.maven.shared.jar.classes.JarClasses;
-import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.UnsupportedProtocolException;
-import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.observers.Debug;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Generates the Project Dependencies report.
@@ -128,24 +96,6 @@
     private PlexusContainer container;
 
     /**
-     * Will be filled with license name / list of projects.
-     */
-    private Map licenseMap = new HashMap()
-    {
-        public Object put( Object key, Object value )
-        {
-            // handle multiple values as a list
-            List valueList = (List) get( key );
-            if ( valueList == null )
-            {
-                valueList = new ArrayList();
-            }
-            valueList.add( value );
-            return super.put( key, valueList );
-        }
-    };
-
-    /**
      * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
      */
     public String getName( Locale locale )
@@ -166,10 +116,22 @@
      */
     public void executeReport( Locale locale )
     {
+        RepositoryUtils repoUtils = new RepositoryUtils( wagonManager, settings, mavenProjectBuilder, factory, resolver,
+                                                         project.getRemoteArtifactRepositories(),
+                                                         project.getPluginArtifactRepositories(), localRepository );
+
         ReportResolutionListener listener = resolveProject();
 
-        DependenciesRenderer r = new DependenciesRenderer( getSink(), locale, listener );
+        Dependencies dependencies = new Dependencies( project, listener, container );
+
+        DependenciesReportConfiguration config =
+            new DependenciesReportConfiguration( dependencyDetailsEnabled, dependencyLocationsEnabled );
 
+        DependenciesRenderer r =
+            new DependenciesRenderer( getSink(), locale, i18n, dependencies, listener, config, repoUtils );
+
+        repoUtils.setLog( getLog() );
+        r.setLog( getLog() );
         r.render();
     }
 
@@ -178,7 +140,7 @@
         Map managedVersions = null;
         try
         {
-            managedVersions = createManagedVersionMap( project.getId(), project.getDependencyManagement() );
+            managedVersions = Dependencies.getManagedVersionMap( project, factory );
         }
         catch ( ProjectBuildingException e )
         {
@@ -210,39 +172,6 @@
         return listener;
     }
 
-    private Map createManagedVersionMap( String projectId, DependencyManagement dependencyManagement )
-        throws ProjectBuildingException
-    {
-        Map map;
-        if ( dependencyManagement != null && dependencyManagement.getDependencies() != null )
-        {
-            map = new HashMap();
-            for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
-            {
-                Dependency d = (Dependency) i.next();
-
-                try
-                {
-                    VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
-                    Artifact artifact = factory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(),
-                                                                          versionRange, d.getType(), d.getClassifier(),
-                                                                          d.getScope() );
-                    map.put( d.getManagementKey(), artifact );
-                }
-                catch ( InvalidVersionSpecificationException e )
-                {
-                    throw new ProjectBuildingException( projectId, "Unable to parse version '" + d.getVersion()
-                        + "' for dependency '" + d.getManagementKey() + "': " + e.getMessage(), e );
-                }
-            }
-        }
-        else
-        {
-            map = Collections.EMPTY_MAP;
-        }
-        return map;
-    }
-
     /**
      * @see org.apache.maven.reporting.MavenReport#getOutputName()
      */
@@ -255,955 +184,5 @@
         throws ContextException
     {
         container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-    }
-
-    private class Dependencies
-    {
-        private List projectDependencies;
-
-        private ReportResolutionListener resolvedDependencies;
-
-        public Dependencies( MavenProject project, ReportResolutionListener listener )
-        {
-            /*
-             * Workaround to ensure proper File objects in the Artifacts from the ReportResolutionListener
-             */
-            Map projectMap = new HashMap();
-            Iterator it = project.getArtifacts().iterator();
-            while ( it.hasNext() )
-            {
-                Artifact artifact = (Artifact) it.next();
-                projectMap.put( ArtifactUtils.versionlessKey( artifact ), artifact );
-            }
-
-            mapArtifactFiles( listener.getRootNode(), projectMap );
-
-            this.projectDependencies = listener.getRootNode().getChildren();
-            this.resolvedDependencies = listener;
-        }
-
-        private void mapArtifactFiles( Node node, Map projectMap )
-        {
-            List childs = node.getChildren();
-            if ( ( childs == null ) || childs.isEmpty() )
-            {
-                return;
-            }
-
-            Iterator it = childs.iterator();
-            while ( it.hasNext() )
-            {
-                Node anode = (ReportResolutionListener.Node) it.next();
-                String key = ArtifactUtils.versionlessKey( anode.getArtifact() );
-                Artifact projartifact = (Artifact) projectMap.get( key );
-                if ( projartifact != null )
-                {
-                    anode.getArtifact().setFile( projartifact.getFile() );
-                }
-
-                mapArtifactFiles( anode, projectMap );
-            }
-        }
-
-        public boolean hasDependencies()
-        {
-            return ( projectDependencies != null ) && ( !this.projectDependencies.isEmpty() );
-        }
-
-        public List getProjectDependencies()
-        {
-            return new ArrayList( projectDependencies );
-        }
-
-        public List getTransitiveDependencies()
-        {
-            List deps = new ArrayList( resolvedDependencies.getArtifacts() );
-            deps.removeAll( projectDependencies );
-            return deps;
-        }
-
-        public List getAllDependencies()
-        {
-            List deps = new ArrayList();
-
-            for ( Iterator it = resolvedDependencies.getArtifacts().iterator(); it.hasNext(); )
-            {
-                ReportResolutionListener.Node node = (ReportResolutionListener.Node) it.next();
-                Artifact artifact = node.getArtifact();
-                deps.add( artifact );
-            }
-            return deps;
-        }
-
-        public Map getDependenciesByScope()
-        {
-            Map dependenciesByScope = new HashMap();
-            for ( Iterator i = getAllDependencies().iterator(); i.hasNext(); )
-            {
-                Artifact artifact = (Artifact) i.next();
-
-                List multiValue = (List) dependenciesByScope.get( artifact.getScope() );
-                if ( multiValue == null )
-                {
-                    multiValue = new ArrayList();
-                }
-                multiValue.add( artifact );
-                dependenciesByScope.put( artifact.getScope(), multiValue );
-            }
-            return dependenciesByScope;
-        }
-    }
-
-    private class DependenciesRenderer
-        extends AbstractMavenReportRenderer
-    {
-        private final Locale locale;
-
-        private final ReportResolutionListener listener;
-
-        DependenciesRenderer( Sink sink, Locale locale, ReportResolutionListener listener )
-        {
-            super( sink );
-
-            this.locale = locale;
-
-            this.listener = listener;
-        }
-
-        public String getTitle()
-        {
-            return getReportString( "report.dependencies.title" );
-        }
-
-        public void renderBody()
-        {
-            // Dependencies report
-            Dependencies deps = new Dependencies( project, listener );
-
-            if ( !deps.hasDependencies() )
-            {
-                startSection( getTitle() );
-
-                // TODO: should the report just be excluded?
-                paragraph( getReportString( "report.dependencies.nolist" ) );
-
-                endSection();
-
-                return;
-            }
-
-            // === Section: Project Dependencies.
-            renderSectionProjectDependencies( deps );
-
-            // === Section: Project Transitive Dependencies.
-            renderSectionProjectTransitiveDependencies( deps );
-
-            // === Section: Project Dependency Graph.
-            renderSectionProjectDependencyGraph();
-
-            // === Section: Licenses
-            renderSectionDependencyLicenseListing();
-
-            if ( dependencyDetailsEnabled )
-            {
-                // === Section: Dependency File Details.
-                renderSectionDependencyFileDetails( deps );
-            }
-
-            if ( !settings.isOffline() && dependencyLocationsEnabled )
-            {
-                // === Section: Dependency Repository Locations.
-                renderSectionDependencyRepositoryLocations( deps );
-            }
-        }
-
-        private String[] getDependencyTableHeader()
-        {
-            String groupId = getReportString( "report.dependencies.column.groupId" );
-            String artifactId = getReportString( "report.dependencies.column.artifactId" );
-            String version = getReportString( "report.dependencies.column.version" );
-            String classifier = getReportString( "report.dependencies.column.classifier" );
-            String type = getReportString( "report.dependencies.column.type" );
-            String optional = getReportString( "report.dependencies.column.optional" );
-            String[] tableHeader = new String[] { groupId, artifactId, version, classifier, type, optional };
-            return tableHeader;
-        }
-
-        private void renderSectionProjectDependencies( Dependencies dependencies )
-        {
-            String[] tableHeader = getDependencyTableHeader();
-
-            startSection( getTitle() );
-
-            // collect dependencies by scope
-            Map dependenciesByScope = dependencies.getDependenciesByScope();
-
-            renderDependenciesForAllScopes( tableHeader, dependenciesByScope );
-
-            endSection();
-        }
-
-        private void renderDependenciesForAllScopes( String[] tableHeader, Map dependenciesByScope )
-        {
-            renderDependenciesForScope( Artifact.SCOPE_COMPILE,
-                                        (List) dependenciesByScope.get( Artifact.SCOPE_COMPILE ), tableHeader );
-            renderDependenciesForScope( Artifact.SCOPE_RUNTIME,
-                                        (List) dependenciesByScope.get( Artifact.SCOPE_RUNTIME ), tableHeader );
-            renderDependenciesForScope( Artifact.SCOPE_TEST, (List) dependenciesByScope.get( Artifact.SCOPE_TEST ),
-                                        tableHeader );
-            renderDependenciesForScope( Artifact.SCOPE_PROVIDED, (List) dependenciesByScope
-                .get( Artifact.SCOPE_PROVIDED ), tableHeader );
-            renderDependenciesForScope( Artifact.SCOPE_SYSTEM, (List) dependenciesByScope.get( Artifact.SCOPE_SYSTEM ),
-                                        tableHeader );
-        }
-
-        private void renderSectionProjectTransitiveDependencies( Dependencies dependencies )
-        {
-            List artifacts = dependencies.getTransitiveDependencies();
-
-            startSection( getReportString( "report.transitivedependencies.title" ) );
-
-            if ( artifacts.isEmpty() )
-            {
-                paragraph( getReportString( "report.transitivedependencies.nolist" ) );
-            }
-            else
-            {
-                String[] tableHeader = getDependencyTableHeader();
-                Map dependenciesByScope = dependencies.getDependenciesByScope();
-
-                paragraph( getReportString( "report.transitivedependencies.intro" ) );
-
-                renderDependenciesForAllScopes( tableHeader, dependenciesByScope );
-            }
-
-            endSection();
-        }
-
-        private void renderSectionProjectDependencyGraph()
-        {
-            startSection( getReportString( "report.dependencies.graph.title" ) );
-
-            // === Section: Dependency Tree
-            renderSectionDependencyTree();
-
-            // === Section: Dependency Listings
-            renderSectionDependencyListing();
-
-            endSection();
-        }
-
-        private void renderSectionDependencyTree()
-        {
-            // for Dependencies Graph Tree
-            startSection( getReportString( "report.dependencies.graph.tree.title" ) );
-            sink.paragraph();
-            sink.list();
-            printDependencyListing( listener.getRootNode() );
-            sink.list_();
-            sink.paragraph_();
-            endSection();
-        }
-
-        private void renderSectionDependencyFileDetails( Dependencies dependencies )
-        {
-            startSection( getReportString( "report.dependencies.file.details.title" ) );
-
-            List alldeps = dependencies.getAllDependencies();
-            Collections.sort( alldeps, getArtifactComparator() );
-
-            startTable();
-            String filename = getReportString( "report.dependencies.file.details.column.file" );
-            String size = getReportString( "report.dependencies.file.details.column.size" );
-            String entries = getReportString( "report.dependencies.file.details.column.entries" );
-            String classes = getReportString( "report.dependencies.file.details.column.classes" );
-            String packages = getReportString( "report.dependencies.file.details.column.packages" );
-            String jdkrev = getReportString( "report.dependencies.file.details.column.jdkrev" );
-            String debug = getReportString( "report.dependencies.file.details.column.debug" );
-            String sealed = getReportString( "report.dependencies.file.details.column.sealed" );
-
-            String[] tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debug, sealed };
-            tableHeader( tableHeader );
-
-            int totaldeps = 0;
-            long totaldepsize = 0;
-            int totalentries = 0;
-            int totalclasses = 0;
-            int totalpackages = 0;
-            double highestjdk = 0.0;
-            int totaldebug = 0;
-            int totalsealed = 0;
-
-            DecimalFormat decFormat = new DecimalFormat( "#,##0" );
-
-            for ( Iterator it = alldeps.iterator(); it.hasNext(); )
-            {
-                Artifact artifact = (Artifact) it.next();
-
-                if ( !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
-                {
-                    // TODO site:run Why do we need to resolve this...
-                    if ( artifact.getFile() == null )
-                    {
-                        try
-                        {
-                            List remoteRepositories = new ArrayList();
-                            remoteRepositories.addAll( project.getPluginArtifactRepositories() );
-                            remoteRepositories.addAll( project.getRemoteArtifactRepositories() );
-                            resolver.resolve( artifact, remoteRepositories, localRepository );
-                        }
-                        catch ( ArtifactResolutionException e )
-                        {
-                            getLog().error( "Artifact: " + artifact.getId() + " has no file.", e );
-                            continue;
-                        }
-                        catch ( ArtifactNotFoundException e )
-                        {
-                            getLog().error( "Artifact: " + artifact.getId() + " has no file.", e );
-                            continue;
-                        }
-                    }
-
-                    if ( artifact.getFile() == null )
-                    {
-                        getLog().error( "Artifact: " + artifact.getId() + " has no file." );
-                        continue;
-                    }
-
-                    File artifactFile = artifact.getFile();
-
-                    totaldeps++;
-                    totaldepsize += artifactFile.length();
-
-                    if ( "jar".equalsIgnoreCase( artifact.getType() ) || "war".equalsIgnoreCase( artifact.getType() )
-                        || "ear".equalsIgnoreCase( artifact.getType() ) || "sar".equalsIgnoreCase( artifact.getType() )
-                        || "rar".equalsIgnoreCase( artifact.getType() ) || "par".equalsIgnoreCase( artifact.getType() )
-                        || "ejb".equalsIgnoreCase( artifact.getType() ) )
-                    {
-                        try
-                        {
-                            Jar jar = (Jar) container.lookup( Jar.ROLE );
-                            jar.setFile( artifactFile );
-                            JarClasses jclasses = jar.getClasses();
-
-                            String debugstr = "release";
-                            if ( jclasses.isDebugPresent() )
-                            {
-                                debugstr = "debug";
-                                totaldebug++;
-                            }
-
-                            String sealedstr = "";
-                            if ( jar.isSealed() )
-                            {
-                                sealedstr = "sealed";
-                                totalsealed++;
-                            }
-
-                            totalentries += jar.getEntries().size();
-                            totalclasses += jclasses.getClassNames().size();
-                            totalpackages += jclasses.getPackages().size();
-
-                            try
-                            {
-                                highestjdk = Math.max( highestjdk, Double.parseDouble( jclasses.getJdkRevision() ) );
-                            }
-                            catch ( NumberFormatException e )
-                            {
-                                // ignore
-                            }
-
-                            tableRow( new String[] {
-                                artifactFile.getName(),
-                                decFormat.format( artifactFile.length() ),
-                                decFormat.format( jar.getEntries().size() ),
-                                decFormat.format( jclasses.getClassNames().size() ),
-                                decFormat.format( jclasses.getPackages().size() ),
-                                jclasses.getJdkRevision(),
-                                debugstr,
-                                sealedstr } );
-                        }
-                        catch ( JarException e )
-                        {
-                            tableRow( new String[] {
-                                artifact.getId(),
-                                artifactFile.getAbsolutePath(),
-                                e.getMessage(),
-                                "",
-                                "",
-                                "",
-                                "",
-                                "" } );
-                        }
-                        catch ( ComponentLookupException e )
-                        {
-                            tableRow( new String[] {
-                                artifact.getId(),
-                                artifactFile.getAbsolutePath(),
-                                e.getMessage(),
-                                "",
-                                "",
-                                "",
-                                "",
-                                "" } );
-                        }
-                    }
-                    else
-                    {
-                        tableRow( new String[] {
-                            artifactFile.getName(),
-                            decFormat.format( artifactFile.length() ),
-                            "",
-                            "",
-                            "",
-                            "",
-                            "",
-                            "" } );
-                    }
-                }
-            }
-
-            tableRow( new String[] {
-                "" + totaldeps + " total dependencies",
-                decFormat.format( totaldepsize ),
-                decFormat.format( totalentries ),
-                decFormat.format( totalclasses ),
-                decFormat.format( totalpackages ),
-                String.valueOf( highestjdk ),
-                decFormat.format( totaldebug ),
-                decFormat.format( totalsealed ) } );
-
-            endTable();
-            endSection();
-        }
-
-        private void populateRepositoryMap( Map repos, List rawRepos )
-        {
-            Iterator it = rawRepos.iterator();
-            while ( it.hasNext() )
-            {
-                ArtifactRepository repo = (ArtifactRepository) it.next();
-                repos.put( repo.getId(), repo );
-            }
-        }
-
-        private void renderSectionDependencyRepositoryLocations( Dependencies dependencies )
-        {
-            startSection( getReportString( "report.dependencies.repo.locations.title" ) );
-
-            // Collect Alphabetical Dependencies
-            List alldeps = dependencies.getAllDependencies();
-            Collections.sort( alldeps, getArtifactComparator() );
-
-            // Collect Repositories
-            Map repoMap = new HashMap();
-
-            populateRepositoryMap( repoMap, project.getRemoteArtifactRepositories() );
-
-            for ( Iterator it = alldeps.iterator(); it.hasNext(); )
-            {
-                Artifact artifact = (Artifact) it.next();
-                try
-                {
-                    MavenProject artifactProject = getMavenProjectFromRepository( artifact, localRepository );
-
-                    populateRepositoryMap( repoMap, artifactProject.getRemoteArtifactRepositories() );
-                }
-                catch ( ProjectBuildingException e )
-                {
-                    getLog().warn( "Unable to create maven project from repository.", e );
-                }
-            }
-
-            // Render Repository List
-
-            startTable();
-            String repoid = getReportString( "report.dependencies.repo.locations.column.repoid" );
-            String url = getReportString( "report.dependencies.repo.locations.column.url" );
-            String release = getReportString( "report.dependencies.repo.locations.column.release" );
-            String snapshot = getReportString( "report.dependencies.repo.locations.column.snapshot" );
-
-            String[] tableHeader = new String[] { repoid, url, release, snapshot };
-            tableHeader( tableHeader );
-
-            String releaseEnabled = getReportString( "report.dependencies.repo.locations.cell.release.enabled" );
-            String releaseDisabled = getReportString( "report.dependencies.repo.locations.cell.release.disabled" );
-
-            String snapshotEnabled = getReportString( "report.dependencies.repo.locations.cell.snapshot.enabled" );
-            String snapshotDisabled = getReportString( "report.dependencies.repo.locations.cell.snapshot.disabled" );
-
-            for ( Iterator it = repoMap.keySet().iterator(); it.hasNext(); )
-            {
-                String key = (String) it.next();
-                ArtifactRepository repo = (ArtifactRepository) repoMap.get( key );
-
-                sink.tableRow();
-                tableCell( repo.getId() );
-
-                sink.tableCell();
-                sink.link( repo.getUrl() );
-                sink.text( repo.getUrl() );
-                sink.link_();
-                sink.tableCell_();
-
-                ArtifactRepositoryPolicy releasePolicy = repo.getReleases();
-                tableCell( releasePolicy.isEnabled() ? releaseEnabled : releaseDisabled );
-
-                ArtifactRepositoryPolicy snapshotPolicy = repo.getSnapshots();
-                tableCell( snapshotPolicy.isEnabled() ? snapshotEnabled : snapshotDisabled );
-                sink.tableRow_();
-            }
-
-            endTable();
-
-            // Render Aritfact Breakdown.
-
-            sink.paragraph();
-            sink.text( getReportString( "report.dependencies.repo.locations.artifact.breakdown" ) );
-            sink.paragraph_();
-
-            List repoIdList = new ArrayList( repoMap.keySet() );
-
-            startTable();
-            String artifact = getReportString( "report.dependencies.repo.locations.column.artifact" );
-            tableHeader = new String[repoIdList.size() + 1];
-            tableHeader[0] = artifact;
-            int idnum = 1;
-
-            for ( Iterator it = repoIdList.iterator(); it.hasNext(); )
-            {
-                String id = (String) it.next();
-                tableHeader[idnum++] = id;
-            }
-
-            tableHeader( tableHeader );
-
-            for ( Iterator it = alldeps.iterator(); it.hasNext(); )
-            {
-                Artifact dependency = (Artifact) it.next();
-
-                if ( !Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) )
-                {
-                    sink.tableRow();
-
-                    tableCell( dependency.getId() );
-
-                    for ( Iterator itrepo = repoIdList.iterator(); itrepo.hasNext(); )
-                    {
-                        String repokey = (String) itrepo.next();
-                        ArtifactRepository repo = (ArtifactRepository) repoMap.get( repokey );
-
-                        String depUrl = repo.getUrl() + "/" + repo.pathOf( dependency );
-
-                        boolean dependencyExists = false;
-
-                        // check snapshots in snapshots repository only and releases in release repositories...
-                        if ( ( dependency.isSnapshot() && repo.getSnapshots().isEnabled() )
-                            || ( !dependency.isSnapshot() && repo.getReleases().isEnabled() ) )
-                        {
-                            dependencyExists = dependencyExistsInRepo( repo, dependency );
-                        }
-
-                        if ( dependencyExists )
-                        {
-                            sink.tableCell();
-                            sink.link( depUrl );
-
-                            sink.figure();
-                            sink.figureCaption();
-                            sink.text( "Found at " + repo.getUrl() );
-                            sink.figureCaption_();
-                            sink.figureGraphics( "images/icon_success_sml.gif" );
-                            sink.figure_();
-
-                            sink.link_();
-                            sink.tableCell_();
-                        }
-                        else
-                        {
-                            sink.tableCell();
-                            sink.text( "-" );
-                            sink.tableCell_();
-                        }
-                    }
-
-                    sink.tableRow_();
-                }
-            }
-
-            endTable();
-
-            endSection();
-        }
-
-        private boolean dependencyExistsInRepo( ArtifactRepository repo, Artifact artifact )
-        {
-            Wagon wagon;
-
-            try
-            {
-                wagon = wagonManager.getWagon( repo.getProtocol() );
-            }
-            catch ( UnsupportedProtocolException e )
-            {
-                getLog().error( "Unsupported protocol: '" + repo.getProtocol() + "'", e );
-                return false;
-            }
-
-            try
-            {
-                Debug debug = new Debug();
-
-                wagon.addSessionListener( debug );
-                wagon.addTransferListener( debug );
-
-                String id = repo.getId();
-                Repository repository = new Repository( id, repo.getUrl() );
-                AuthenticationInfo auth = wagonManager.getAuthenticationInfo( repo.getId() );
-
-                ProxyInfo proxyInfo = getProxyInfo( settings );
-                if ( proxyInfo != null )
-                {
-                    wagon.connect( repository, auth, proxyInfo );
-                }
-                else
-                {
-                    wagon.connect( repository, auth );
-                }
-
-                return ( wagon.resourceExists( repo.pathOf( artifact ) ) );
-            }
-            catch ( ConnectionException e )
-            {
-                getLog().error( "Unable to connect to: " + repo.getUrl(), e );
-                return false;
-            }
-            catch ( AuthenticationException e )
-            {
-                getLog().error( "Unable to connect to: " + repo.getUrl(), e );
-                return false;
-            }
-            catch ( TransferFailedException e )
-            {
-                getLog().error( "Unable to determine if resource " + artifact + " exists in " + repo.getUrl(), e );
-                return false;
-            }
-            catch ( AuthorizationException e )
-            {
-                getLog().error( "Unable to connect to: " + repo.getUrl(), e );
-                return false;
-            }
-            finally
-            {
-                try
-                {
-                    wagon.disconnect();
-                }
-                catch ( ConnectionException e )
-                {
-                    getLog().error( "Error disconnecting wagon - ignored", e );
-                }
-            }
-        }
-
-        /**
-         * Convenience method to map a <code>Proxy</code> object from the user system settings to a
-         * <code>ProxyInfo</code> object.
-         *
-         * @return a proxyInfo object instancied or null if no active proxy is define in the settings.xml
-         */
-        public ProxyInfo getProxyInfo( Settings settings )
-        {
-            ProxyInfo proxyInfo = null;
-            if ( settings != null && settings.getActiveProxy() != null )
-            {
-                Proxy settingsProxy = settings.getActiveProxy();
-
-                proxyInfo = new ProxyInfo();
-                proxyInfo.setHost( settingsProxy.getHost() );
-                proxyInfo.setType( settingsProxy.getProtocol() );
-                proxyInfo.setPort( settingsProxy.getPort() );
-                proxyInfo.setNonProxyHosts( settingsProxy.getNonProxyHosts() );
-                proxyInfo.setUserName( settingsProxy.getUsername() );
-                proxyInfo.setPassword( settingsProxy.getPassword() );
-            }
-
-            return proxyInfo;
-        }
-
-        private void renderSectionDependencyListing()
-        {
-            startSection( getReportString( "report.dependencies.graph.tables.title" ) );
-            printDescriptionsAndURLs( listener.getRootNode() );
-            endSection();
-        }
-
-        private void renderSectionDependencyLicenseListing()
-        {
-            startSection( getReportString( "report.dependencies.graph.tables.licenses" ) );
-            printGroupedLicenses();
-            endSection();
-        }
-
-        private void renderDependenciesForScope( String scope, List artifacts, String[] tableHeader )
-        {
-            if ( artifacts != null )
-            {
-                // can't use straight artifact comparison because we want optional last
-                Collections.sort( artifacts, getArtifactComparator() );
-
-                startSection( scope );
-
-                paragraph( getReportString( "report.dependencies.intro." + scope ) );
-                startTable();
-                tableHeader( tableHeader );
-
-                for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
-                {
-                    Artifact artifact = (Artifact) iterator.next();
-                    tableRow( getArtifactRow( artifact ) );
-                }
-                endTable();
-
-                endSection();
-            }
-        }
-
-        private Comparator getArtifactComparator()
-        {
-            return new Comparator()
-            {
-                public int compare( Object o1, Object o2 )
-                {
-                    Artifact a1 = (Artifact) o1;
-                    Artifact a2 = (Artifact) o2;
-
-                    // put optional last
-                    if ( a1.isOptional() && !a2.isOptional() )
-                    {
-                        return +1;
-                    }
-                    else if ( !a1.isOptional() && a2.isOptional() )
-                    {
-                        return -1;
-                    }
-                    else
-                    {
-                        return a1.compareTo( a2 );
-                    }
-                }
-            };
-        }
-
-        private String[] getArtifactRow( Artifact artifact )
-        {
-            return new String[] {
-                artifact.getGroupId(),
-                artifact.getArtifactId(),
-                artifact.getVersion(),
-                artifact.getClassifier(),
-                artifact.getType(),
-                artifact.isOptional() ? "(optional)" : " " };
-        }
-
-        private void printDependencyListing( ReportResolutionListener.Node node )
-        {
-            Artifact artifact = node.getArtifact();
-            String id = artifact.getDependencyConflictId();
-
-            sink.listItem();
-            sink.paragraph();
-
-            sink.link( "#" + id );
-            sink.text( id );
-            sink.link_();
-
-            if ( !node.getChildren().isEmpty() )
-            {
-                sink.list();
-                for ( Iterator deps = node.getChildren().iterator(); deps.hasNext(); )
-                {
-                    ReportResolutionListener.Node dep = (ReportResolutionListener.Node) deps.next();
-                    printDependencyListing( dep );
-                }
-                sink.list_();
-            }
-
-            sink.paragraph_();
-            sink.listItem_();
-        }
-
-        private void printDescriptionsAndURLs( ReportResolutionListener.Node node )
-        {
-            Artifact artifact = node.getArtifact();
-            String id = artifact.getDependencyConflictId();
-
-            String unknownLicenseMessage = getReportString( "report.dependencies.graph.tables.unknown" );
-
-            if ( !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
-            {
-                try
-                {
-                    MavenProject artifactProject = getMavenProjectFromRepository( artifact, localRepository );
-                    String artifactDescription = artifactProject.getDescription();
-                    String artifactUrl = artifactProject.getUrl();
-                    String artifactName = artifactProject.getName();
-                    List licenses = artifactProject.getLicenses();
-
-                    sink.paragraph();
-                    sink.anchor( id );
-                    // startSection( artifactName );
-                    sink.bold();
-                    sink.text( artifactName );
-                    sink.bold_();
-                    sink.anchor_();
-                    sink.paragraph_();
-
-                    if ( artifactDescription != null )
-                    {
-                        sink.paragraph();
-                        sink.text( artifactDescription );
-                        sink.paragraph_();
-                    }
-
-                    if ( artifactUrl != null )
-                    {
-                        sink.paragraph();
-                        sink.link( artifactUrl );
-                        sink.text( artifactUrl );
-                        sink.link_();
-                        sink.paragraph_();
-                    }
-
-                    sink.paragraph();
-                    sink.text( getReportString( "report.license.title" ) + ": " );
-                    if ( !licenses.isEmpty() )
-                    {
-                        for ( Iterator iter = licenses.iterator(); iter.hasNext(); )
-                        {
-                            License element = (License) iter.next();
-                            String licenseName = element.getName();
-                            String licenseUrl = element.getUrl();
-
-                            if ( licenseUrl != null )
-                            {
-                                sink.link( licenseUrl );
-                            }
-                            sink.text( licenseName );
-
-                            if ( licenseUrl != null )
-                            {
-                                sink.link_();
-                            }
-
-                            licenseMap.put( licenseName, artifactName );
-
-                        }
-                    }
-                    else
-                    {
-                        sink.text( getReportString( "report.license.nolicense" ) );
-
-                        licenseMap.put( unknownLicenseMessage, artifactName );
-
-                    }
-                    sink.paragraph_();
-
-                    // endSection();
-                    sink.horizontalRule();
-                }
-                catch ( ProjectBuildingException e )
-                {
-                    getLog().debug( e );
-                }
-
-                for ( Iterator deps = node.getChildren().iterator(); deps.hasNext(); )
-                {
-                    ReportResolutionListener.Node dep = (ReportResolutionListener.Node) deps.next();
-                    printDescriptionsAndURLs( dep );
-                }
-            }
-            else
-            {
-                sink.paragraph();
-                sink.anchor( id );
-                sink.bold();
-                sink.text( id );
-                sink.bold_();
-                sink.anchor_();
-                sink.paragraph_();
-
-                sink.paragraph();
-                sink.text( artifact.getFile().toString() );
-                sink.paragraph_();
-            }
-        }
-
-        private void printGroupedLicenses()
-        {
-            for ( Iterator iter = licenseMap.keySet().iterator(); iter.hasNext(); )
-            {
-                String licenseName = (String) iter.next();
-                sink.paragraph();
-                sink.bold();
-                if ( StringUtils.isEmpty( licenseName ) )
-                {
-                    sink.text( i18n.getString( "project-info-report", locale, "report.dependencies.unamed" ) );
-                }
-                else
-                {
-                    sink.text( licenseName );
-                }
-                sink.text( ": " );
-                sink.bold_();
-
-                List projects = (List) licenseMap.get( licenseName );
-                Collections.sort( projects );
-
-                for ( Iterator iterator = projects.iterator(); iterator.hasNext(); )
-                {
-                    String projectName = (String) iterator.next();
-                    sink.text( projectName );
-                    if ( iterator.hasNext() )
-                    {
-                        sink.text( "," );
-                    }
-                    sink.text( " " );
-                }
-
-                sink.paragraph_();
-            }
-        }
-
-        /**
-         * Get the <code>Maven project</code> from the repository depending the <code>Artifact</code> given.
-         *
-         * @param artifact an artifact
-         * @return the Maven project for the given artifact
-         * @throws org.apache.maven.project.ProjectBuildingException
-         *             if any
-         */
-        private MavenProject getMavenProjectFromRepository( Artifact artifact, ArtifactRepository localRepository )
-            throws ProjectBuildingException
-        {
-            Artifact projectArtifact = artifact;
-
-            boolean allowStubModel = false;
-            if ( !"pom".equals( artifact.getType() ) )
-            {
-                projectArtifact = factory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
-                                                                 artifact.getVersion(), artifact.getScope() );
-                allowStubModel = true;
-            }
-
-            // TODO: we should use the MavenMetadataSource instead
-            return mavenProjectBuilder.buildFromRepository( projectArtifact, project.getRemoteArtifactRepositories(),
-                                                            localRepository, allowStubModel );
-        }
-
-        private String getReportString( String key )
-        {
-            return i18n.getString( "project-info-report", locale, key );
-        }
     }
 }

Added: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java?view=auto&rev=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java (added)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java Mon Sep 11 20:07:24 2006
@@ -0,0 +1,210 @@
+package org.apache.maven.report.projectinfo.dependencies;
+
+/*
+ * Copyright 2004-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.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.report.projectinfo.dependencies.ReportResolutionListener.Node;
+import org.apache.maven.shared.jar.Jar;
+import org.apache.maven.shared.jar.JarException;
+import org.apache.maven.shared.jar.classes.JarClasses;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class Dependencies
+{
+    public final static String IS_DEBUG_PRESENT = "is-debug-present";
+
+    public final static String IS_SEALED = "sealed";
+
+    public final static String FILE_LENGTH = "filelength";
+
+    public final static String JAR_ENTRIES = "jar-entries";
+
+    public final static String NUM_OF_CLASSES = "num-of-classes";
+
+    public final static String NUM_OF_PACKAGES = "num-of-packages";
+
+    private List projectDependencies;
+
+    private ReportResolutionListener resolvedDependencies;
+
+    private Jar jar;
+
+    public Dependencies( MavenProject project, ReportResolutionListener listener, PlexusContainer container )
+    {
+        this.projectDependencies = listener.getRootNode().getChildren();
+        this.resolvedDependencies = listener;
+
+        /*
+        * Workaround to ensure proper File objects in the Artifacts from the ReportResolutionListener
+        */
+        Map projectMap = new HashMap();
+        Iterator it = project.getArtifacts().iterator();
+        while ( it.hasNext() )
+        {
+            Artifact artifact = (Artifact) it.next();
+            projectMap.put( ArtifactUtils.versionlessKey( artifact ), artifact );
+        }
+
+        mapArtifactFiles( listener.getRootNode(), projectMap );
+
+        try
+        {
+            this.jar = (Jar) container.lookup( Jar.ROLE );
+        }
+        catch ( ComponentLookupException ex )
+        {
+            //TODO: handle exception
+        }
+    }
+
+    public static Map getManagedVersionMap( MavenProject project, ArtifactFactory factory )
+        throws ProjectBuildingException
+    {
+        DependencyManagement dependencyManagement = project.getDependencyManagement();
+        Map managedVersionMap;
+
+        if ( dependencyManagement != null && dependencyManagement.getDependencies() != null )
+        {
+            managedVersionMap = new HashMap();
+            for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
+            {
+                Dependency d = (Dependency) i.next();
+
+                try
+                {
+                    VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
+                    Artifact artifact = factory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(),
+                                                                          versionRange, d.getType(), d.getClassifier(),
+                                                                          d.getScope() );
+                    managedVersionMap.put( d.getManagementKey(), artifact );
+                }
+                catch ( InvalidVersionSpecificationException e )
+                {
+                    throw new ProjectBuildingException( project.getId(), "Unable to parse version '" + d.getVersion() +
+                        "' for dependency '" + d.getManagementKey() + "': " + e.getMessage(), e );
+                }
+            }
+        }
+        else
+        {
+            managedVersionMap = Collections.EMPTY_MAP;
+        }
+
+        return managedVersionMap;
+    }
+
+
+    private void mapArtifactFiles( Node node, Map projectMap )
+    {
+        List childs = node.getChildren();
+        if ( ( childs == null ) || childs.isEmpty() )
+        {
+            return;
+        }
+
+        Iterator it = childs.iterator();
+        while ( it.hasNext() )
+        {
+            Node anode = (ReportResolutionListener.Node) it.next();
+            String key = ArtifactUtils.versionlessKey( anode.getArtifact() );
+            Artifact projartifact = (Artifact) projectMap.get( key );
+            if ( projartifact != null )
+            {
+                anode.getArtifact().setFile( projartifact.getFile() );
+            }
+
+            mapArtifactFiles( anode, projectMap );
+        }
+    }
+
+    public boolean hasDependencies()
+    {
+        return ( projectDependencies != null ) && ( !this.projectDependencies.isEmpty() );
+    }
+
+    public List getProjectDependencies()
+    {
+        return new ArrayList( projectDependencies );
+    }
+
+    public List getTransitiveDependencies()
+    {
+        List deps = new ArrayList( resolvedDependencies.getArtifacts() );
+        deps.removeAll( projectDependencies );
+        return deps;
+    }
+
+    public List getAllDependencies()
+    {
+        List deps = new ArrayList();
+
+        for ( Iterator it = resolvedDependencies.getArtifacts().iterator(); it.hasNext(); )
+        {
+            ReportResolutionListener.Node node = (ReportResolutionListener.Node) it.next();
+            Artifact artifact = node.getArtifact();
+            deps.add( artifact );
+        }
+        return deps;
+    }
+
+    public Map getDependenciesByScope()
+    {
+        Map dependenciesByScope = new HashMap();
+        for ( Iterator i = getAllDependencies().iterator(); i.hasNext(); )
+        {
+            Artifact artifact = (Artifact) i.next();
+
+            List multiValue = (List) dependenciesByScope.get( artifact.getScope() );
+            if ( multiValue == null )
+            {
+                multiValue = new ArrayList();
+            }
+            multiValue.add( artifact );
+            dependenciesByScope.put( artifact.getScope(), multiValue );
+        }
+        return dependenciesByScope;
+    }
+
+    public JarDependencyDetails getJarDependencyDetails( Artifact artifact )
+        throws JarException
+    {
+        File artifactFile = artifact.getFile();
+        JarClasses jarClasses;
+
+        jar.setFile( artifactFile );
+        jarClasses = jar.getClasses();
+
+        return new JarDependencyDetails( jarClasses, jar.isSealed(), jar.getEntries() );
+    }
+}

Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java?view=auto&rev=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java (added)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java Mon Sep 11 20:07:24 2006
@@ -0,0 +1,42 @@
+package org.apache.maven.report.projectinfo.dependencies;
+
+/*
+ * Copyright 2004-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.
+ */
+
+public class DependenciesReportConfiguration
+{
+    private boolean dependencyDetailsEnabled;
+
+    private boolean dependencyLocationsEnabled;
+
+    public DependenciesReportConfiguration( boolean detailsEnabled, boolean locationEnabled )
+    {
+        this.dependencyDetailsEnabled = detailsEnabled;
+        this.dependencyLocationsEnabled = locationEnabled;
+    }
+
+    public boolean getDependencyDetailsEnabled()
+    {
+        return dependencyDetailsEnabled;
+    }
+
+    public boolean getDependencyLocationsEnabled()
+    {
+        //TODO: 
+        //   ( !settings.isOffline() && dependencyLocationsEnabled )
+        return dependencyLocationsEnabled;
+    }
+}

Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java?view=auto&rev=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java (added)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java Mon Sep 11 20:07:24 2006
@@ -0,0 +1,67 @@
+package org.apache.maven.report.projectinfo.dependencies;
+
+/*
+ * Copyright 2004-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.
+ */
+
+import org.apache.maven.shared.jar.classes.JarClasses;
+
+import java.util.List;
+
+public class JarDependencyDetails
+{
+    private JarClasses jarClasses;
+
+    private boolean isSealed;
+
+    private List entries;
+
+    public JarDependencyDetails( JarClasses classes, boolean sealed, List entries )
+    {
+        jarClasses = classes;
+        isSealed = sealed;
+        this.entries = entries;
+    }
+
+    public boolean isDebugPresent()
+    {
+        return jarClasses.isDebugPresent();
+    }
+
+    public boolean isSealed()
+    {
+        return isSealed;
+    }
+
+    public String getJdkRevision()
+    {
+        return jarClasses.getJdkRevision();
+    }
+
+    public long getPackageSize()
+    {
+        return jarClasses.getPackages().size();
+    }
+
+    public long getClassSize()
+    {
+        return jarClasses.getClassNames().size();
+    }
+
+    public long getEntries()
+    {
+        return entries.size();
+    }
+}

Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/JarDependencyDetails.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListener.java (from r442415, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ReportResolutionListener.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListener.java?view=diff&rev=442431&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ReportResolutionListener.java&r1=442415&p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListener.java&r2=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ReportResolutionListener.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ReportResolutionListener.java Mon Sep 11 20:07:24 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.report.projectinfo;
+package org.apache.maven.report.projectinfo.dependencies;
 
 /*
  * Copyright 2004-2006 The Apache Software Foundation.
@@ -149,7 +149,7 @@
         return artifacts.values();
     }
 
-    static class Node
+    public static class Node
     {
         private Node parent;
 

Added: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?view=auto&rev=442431
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java (added)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java Mon Sep 11 20:07:24 2006
@@ -0,0 +1,232 @@
+package org.apache.maven.report.projectinfo.dependencies;
+
+/*
+ * Copyright 2004-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.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.UnsupportedProtocolException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.observers.Debug;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.repository.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RepositoryUtils
+{
+    private Log log;
+
+    private WagonManager wagonManager;
+
+    private Settings settings;
+
+    private MavenProjectBuilder mavenProjectBuilder;
+
+    private ArtifactFactory factory;
+
+    private List remoteRepositories;
+
+    private List pluginRepositories;
+
+    private ArtifactResolver resolver;
+
+    private ArtifactRepository localRepository;
+
+    public RepositoryUtils( WagonManager wagonManager, Settings settings, MavenProjectBuilder mavenProjectBuilder,
+                            ArtifactFactory factory, ArtifactResolver resolver, List remoteRepositories,
+                            List pluginRepositories, ArtifactRepository localRepository )
+    {
+        this.wagonManager = wagonManager;
+        this.settings = settings;
+        this.mavenProjectBuilder = mavenProjectBuilder;
+        this.factory = factory;
+        this.resolver = resolver;
+        this.remoteRepositories = remoteRepositories;
+        this.pluginRepositories = pluginRepositories;
+        this.localRepository = localRepository;
+    }
+
+    public void setLog( Log log )
+    {
+        this.log = log;
+    }
+
+    public ArtifactRepository getLocalRepository()
+    {
+        return localRepository;
+    }
+
+    public List getRemoteArtifactRepositories()
+    {
+        return remoteRepositories;
+    }
+
+    public List getPluginArtifactRepositories()
+    {
+        return pluginRepositories;
+    }
+
+    public void resolve( Artifact artifact )
+        throws ArtifactResolutionException, ArtifactNotFoundException
+    {
+        List remoteRepositories = new ArrayList();
+        remoteRepositories.addAll( pluginRepositories );
+        remoteRepositories.addAll( remoteRepositories );
+
+        resolver.resolve( artifact, remoteRepositories, localRepository );
+    }
+
+    public boolean dependencyExistsInRepo( ArtifactRepository repo, Artifact artifact )
+    {
+        Wagon wagon;
+
+        try
+        {
+            wagon = wagonManager.getWagon( repo.getProtocol() );
+        }
+        catch ( UnsupportedProtocolException e )
+        {
+            log.error( "Unsupported protocol: '" + repo.getProtocol() + "'", e );
+            return false;
+        }
+
+        try
+        {
+            Debug debug = new Debug();
+
+            wagon.addSessionListener( debug );
+            wagon.addTransferListener( debug );
+
+            String id = repo.getId();
+            Repository repository = new Repository( id, repo.getUrl() );
+            AuthenticationInfo auth = wagonManager.getAuthenticationInfo( repo.getId() );
+
+            ProxyInfo proxyInfo = getProxyInfo( settings );
+            if ( proxyInfo != null )
+            {
+                wagon.connect( repository, auth, proxyInfo );
+            }
+            else
+            {
+                wagon.connect( repository, auth );
+            }
+
+            return ( wagon.resourceExists( repo.pathOf( artifact ) ) );
+        }
+        catch ( ConnectionException e )
+        {
+            log.error( "Unable to connect to: " + repo.getUrl(), e );
+            return false;
+        }
+        catch ( AuthenticationException e )
+        {
+            log.error( "Unable to connect to: " + repo.getUrl(), e );
+            return false;
+        }
+        catch ( TransferFailedException e )
+        {
+            log.error( "Unable to determine if resource " + artifact + " exists in " + repo.getUrl(), e );
+            return false;
+        }
+        catch ( AuthorizationException e )
+        {
+            log.error( "Unable to connect to: " + repo.getUrl(), e );
+            return false;
+        }
+        finally
+        {
+            try
+            {
+                wagon.disconnect();
+            }
+            catch ( ConnectionException e )
+            {
+                log.error( "Error disconnecting wagon - ignored", e );
+            }
+        }
+    }
+
+    /**
+     * Convenience method to map a <code>Proxy</code> object from the user system settings to a <code>ProxyInfo</code>
+     * object.
+     *
+     * @param settings the system settings
+     * @return a proxyInfo object instancied or null if no active proxy is define in the settings.xml
+     */
+    public ProxyInfo getProxyInfo( Settings settings )
+    {
+        ProxyInfo proxyInfo = null;
+        if ( settings != null && settings.getActiveProxy() != null )
+        {
+            Proxy settingsProxy = settings.getActiveProxy();
+
+            proxyInfo = new ProxyInfo();
+            proxyInfo.setHost( settingsProxy.getHost() );
+            proxyInfo.setType( settingsProxy.getProtocol() );
+            proxyInfo.setPort( settingsProxy.getPort() );
+            proxyInfo.setNonProxyHosts( settingsProxy.getNonProxyHosts() );
+            proxyInfo.setUserName( settingsProxy.getUsername() );
+            proxyInfo.setPassword( settingsProxy.getPassword() );
+        }
+
+        return proxyInfo;
+    }
+
+    /**
+     * Get the <code>Maven project</code> from the repository depending the <code>Artifact</code> given.
+     *
+     * @param artifact        an artifact
+     * @param localRepository the local repository
+     * @return the Maven project for the given artifact
+     * @throws org.apache.maven.project.ProjectBuildingException
+     *          if any
+     */
+    public MavenProject getMavenProjectFromRepository( Artifact artifact, ArtifactRepository localRepository )
+        throws ProjectBuildingException
+    {
+        Artifact projectArtifact = artifact;
+
+        boolean allowStubModel = false;
+        if ( !"pom".equals( artifact.getType() ) )
+        {
+            projectArtifact = factory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
+                                                             artifact.getVersion(), artifact.getScope() );
+            allowStubModel = true;
+        }
+
+        // TODO: we should use the MavenMetadataSource instead
+        return mavenProjectBuilder.buildFromRepository( projectArtifact, remoteRepositories, localRepository,
+                                                        allowStubModel );
+    }
+}

Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native