You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/06/14 17:25:48 UTC

svn commit: r547277 [1/16] - in /maven/archiva/trunk: archiva-base/ archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-base/archiva-dependency-graph/ archiva-base/archiva-depende...

Author: joakime
Date: Thu Jun 14 08:25:42 2007
New Revision: 547277

URL: http://svn.apache.org/viewvc?view=rev&rev=547277
Log:
[MRM-410] Dependency Tree is not shown in artifact details screen.
Adding support libs.


Added:
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTaskException.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/PotentialCyclicEdgeProducer.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeCyclicPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeDisabledPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeExactScopePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeExcludedPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeFromPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeScopeClosure.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeToPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/EdgeWithinScopePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/NodeFromParentPredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/NodeInEdgePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/NodePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/OrphanedNodePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/ToArtifactReferenceTransformer.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/functors/UnresolvedGraphNodePredicate.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/AbstractReduceEdgeVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/DependencyManagementApplier.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/DependencyManagementStack.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/FlagCyclicEdgesTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/FlagCyclicEdgesVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/FlagExcludedEdgesTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/FlagExcludedEdgesVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/GraphCopier.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/PopulateDependencyManagementTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/PopulateGraphMasterTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceEnabledEdgesTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceEnabledEdgesVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceScopeTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceScopeVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceTransitiveEdgesTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ReduceTransitiveEdgesVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/ResolveGraphTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/UpdateScopesTask.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/UpdateScopesVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/BaseVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/DependencyGraphVisitor.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/DependencyGraphWalker.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/WalkBreadthFirstSearch.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/walk/WalkDepthFirstSearch.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AllTests.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaCommonDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaCommonMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaWebappDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaWebappMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaXmlToolsDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ArchivaXmlToolsMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ContinuumStoreDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/ContinuumStoreMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/DepManDeepVersionDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/DepManDeepVersionMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/Keys.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MemoryRepositoryDependencyGraphBuilder.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/SimpleDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/SimpleMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/WagonManagerDependencyGraphTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/WagonManagerMemoryRepository.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/functors/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/functors/ToKeyTransformer.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/tasks/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/tasks/DependencyManagementStackTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/walk/
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/walk/DependencyGraphWalkerTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/walk/WalkCollector.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/DependencyScopeTest.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/ProjectModelBasedGraphBuilder.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ProjectModelResolutionListener.java   (with props)
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ProjectModelResolverStack.java   (with props)
    maven/archiva/trunk/tools/   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/pom.xml   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/CreateArchivaDependencyResolutionTestCaseMojo.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/functors/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/functors/ArtifactComparator.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/functors/DependencyNodeToArtifactTransformer.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/functors/MatchingDependencyPredicate.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/testgen/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/testgen/AbstractCreator.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/testgen/DependencyGraphTestCreator.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/testgen/DependencyUtils.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/testgen/MemoryRepositoryCreator.java   (with props)
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/utils/
    maven/archiva/trunk/tools/maven-archivadev-plugin/src/main/java/org/apache/maven/archiva/plugins/dev/utils/VariableNames.java   (with props)
    maven/archiva/trunk/tools/pom.xml   (with props)
Modified:
    maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
    maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/DependencyScope.java
    maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
    maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
    maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java
    maven/archiva/trunk/archiva-base/pom.xml

Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?view=diff&rev=547277&r1=547276&r2=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java Thu Jun 14 08:25:42 2007
@@ -300,18 +300,19 @@
     {
         synchronized ( effectiveModelFilter )
         {
-            effectiveModelFilter.clearResolvers();
+            effectiveModelFilter.getProjectModelResolverStack().clearResolvers();
 
             // Add the database resolver first!
-            effectiveModelFilter.addProjectModelResolver( databaseResolver );
+            effectiveModelFilter.getProjectModelResolverStack().addProjectModelResolver( databaseResolver );
 
             List ret = this.resolverFactory.getAllResolvers();
             Iterator it = ret.iterator();
             while ( it.hasNext() )
             {
                 ProjectModelResolver resolver = (ProjectModelResolver) it.next();
+                // TODO: Use listener to perform database saving of found models, instead of wrapped resolver.
                 ProjectModelResolver wrapped = new WrappedDatabaseProjectModelResolver( dao, resolver );
-                effectiveModelFilter.addProjectModelResolver( wrapped );
+                effectiveModelFilter.getProjectModelResolverStack().addProjectModelResolver( wrapped );
             }
         }
     }

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 14 08:25:42 2007
@@ -0,0 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
+cobertura.ser

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml Thu Jun 14 08:25:42 2007
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
+    <version>1.0-alpha-2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>archiva-dependency-graph</artifactId>
+  <name>Archiva Base :: Dependency Graph</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-xml-tools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-expression-evaluator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.cache</groupId>
+      <artifactId>plexus-cache-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.cache</groupId>
+      <artifactId>plexus-cache-ehcache</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.registry</groupId>
+      <artifactId>plexus-registry-commons</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,200 @@
+package org.apache.maven.archiva.dependency;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.archiva.dependency.graph.DependencyGraph;
+import org.apache.maven.archiva.dependency.graph.DependencyGraphBuilder;
+import org.apache.maven.archiva.dependency.graph.GraphListener;
+import org.apache.maven.archiva.dependency.graph.GraphPhaseEvent;
+import org.apache.maven.archiva.dependency.graph.GraphTask;
+import org.apache.maven.archiva.dependency.graph.GraphTaskException;
+import org.apache.maven.archiva.dependency.graph.PotentialCyclicEdgeProducer;
+import org.apache.maven.archiva.dependency.graph.tasks.FlagCyclicEdgesTask;
+import org.apache.maven.archiva.dependency.graph.tasks.FlagExcludedEdgesTask;
+import org.apache.maven.archiva.dependency.graph.tasks.PopulateGraphMasterTask;
+import org.apache.maven.archiva.dependency.graph.tasks.ReduceEnabledEdgesTask;
+import org.apache.maven.archiva.dependency.graph.tasks.ReduceScopeTask;
+import org.apache.maven.archiva.dependency.graph.tasks.ReduceTransitiveEdgesTask;
+import org.apache.maven.archiva.dependency.graph.tasks.RefineConflictsTask;
+import org.apache.maven.archiva.dependency.graph.tasks.UpdateScopesTask;
+import org.apache.maven.archiva.model.DependencyScope;
+import org.apache.maven.archiva.model.VersionedReference;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * DependencyGraphFactory 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ * 
+ * @plexus.component role="org.apache.maven.archiva.dependency.DependencyGraphFactory"
+ */
+public class DependencyGraphFactory
+{
+    private GraphTask taskFlagCyclicEdges;
+
+    private PopulateGraphMasterTask taskPopulateGraph;
+
+    private ReduceScopeTask taskReduceScope;
+
+    private List listeners;
+
+    private DependencyGraphBuilder graphBuilder;
+
+    private List tasks;
+
+    public DependencyGraphFactory()
+    {
+        listeners = new ArrayList();
+
+        taskFlagCyclicEdges = new FlagCyclicEdgesTask();
+        taskPopulateGraph = new PopulateGraphMasterTask();
+        taskReduceScope = new ReduceScopeTask( DependencyScope.TEST );
+
+        tasks = new ArrayList();
+
+        /* Take the basic graph, and expand the nodes fully, including depman.
+         */
+        tasks.add( taskPopulateGraph );
+
+        /* Identify, flag, and disable excluded edges.
+         */
+        tasks.add( new FlagExcludedEdgesTask() );
+
+        /* Reduce the edges of the graph to only those that are enabled.
+         */
+        tasks.add( new ReduceEnabledEdgesTask() );
+
+        /* Identify dependencies that conflict, resolve to single node.
+         * 
+         * This will ...
+         * 1) filter the distant conflicts away for the nearer ones.
+         * 2) same distance nodes will pick 'newest' version.
+         * 
+         * This can cause a collapsing of node versions.
+         */
+        tasks.add( new RefineConflictsTask() );
+
+        /* Reduce the scope of the graph to those visible by the 'test' scope.
+         */
+        tasks.add( taskReduceScope );
+
+        /* Reduce the edges of the graph.  Use the transitive reduction algorithm
+         * to remove redundant edges.
+         */
+        tasks.add( new ReduceTransitiveEdgesTask() );
+
+        /* Update the scopes of the edges to conform to the parent setting. 
+         */
+        tasks.add( new UpdateScopesTask() );
+    }
+
+    public void addGraphListener( GraphListener listener )
+    {
+        this.listeners.add( listener );
+    }
+
+    /**
+     * Get the Graph for a specific Versioned Project Reference.
+     * 
+     * @param versionedProjectReference
+     * @return
+     */
+    public DependencyGraph getGraph( VersionedReference versionedProjectReference )
+        throws GraphTaskException
+    {
+        DependencyGraph graph = graphBuilder.createGraph( versionedProjectReference );
+
+        triggerGraphPhase( GraphPhaseEvent.GRAPH_NEW, null, graph );
+
+        Iterator it = this.tasks.iterator();
+        while ( it.hasNext() )
+        {
+            GraphTask task = (GraphTask) it.next();
+            try
+            {
+                triggerGraphPhase( GraphPhaseEvent.GRAPH_TASK_PRE, task, graph );
+                task.executeTask( graph );
+                if ( task instanceof PotentialCyclicEdgeProducer )
+                {
+                    taskFlagCyclicEdges.executeTask( graph );
+                }
+                triggerGraphPhase( GraphPhaseEvent.GRAPH_TASK_POST, task, graph );
+            }
+            catch ( GraphTaskException e )
+            {
+                triggerGraphError( e, graph );
+                throw e;
+            }
+            catch ( Exception e )
+            {
+                GraphTaskException gte = new GraphTaskException( e.getMessage(), e );
+                triggerGraphError( gte, graph );
+                throw gte;
+            }
+        }
+
+        triggerGraphPhase( GraphPhaseEvent.GRAPH_DONE, null, graph );
+
+        return graph;
+    }
+
+    public void removeGraphListener( GraphListener listener )
+    {
+        this.listeners.remove( listener );
+    }
+
+    public void setDesiredScope( String scope )
+    {
+        taskReduceScope.setScope( scope );
+    }
+
+    public void setGraphBuilder( DependencyGraphBuilder graphBuilder )
+    {
+        this.graphBuilder = graphBuilder;
+        taskPopulateGraph.setBuilder( graphBuilder );
+    }
+
+    private void triggerGraphError( GraphTaskException e, DependencyGraph graph )
+    {
+        Iterator it = listeners.iterator();
+        while ( it.hasNext() )
+        {
+            GraphListener listener = (GraphListener) it.next();
+            listener.graphError( e, graph );
+        }
+    }
+
+    private void triggerGraphPhase( int type, GraphTask task, DependencyGraph graph )
+    {
+        GraphPhaseEvent evt = new GraphPhaseEvent( type, task, graph );
+
+        Iterator it = listeners.iterator();
+        while ( it.hasNext() )
+        {
+            GraphListener listener = (GraphListener) it.next();
+            listener.graphPhaseEvent( evt );
+        }
+    }
+
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/DependencyGraphFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,228 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.maven.archiva.dependency.graph.functors.EdgeFromPredicate;
+import org.apache.maven.archiva.dependency.graph.functors.EdgeToPredicate;
+import org.apache.maven.archiva.model.ArtifactReference;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * DependencyGraph 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyGraph
+{
+    public static final int DISABLED_CYCLIC = 0;
+
+    public static final int DISABLED_EXCLUDED = 1;
+
+    public static final int DISABLED_OPTIONAL = 2;
+
+    public static final int DISABLED_NEARER_DEP = 3;
+
+    public static final int DISABLED_NEARER_EDGE = 4;
+
+    private DependencyGraphNode rootNode;
+
+    private Set edges = new HashSet();
+
+    private ListOrderedMap nodes = new ListOrderedMap();
+
+    public DependencyGraph( String groupId, String artifactId, String version )
+    {
+        ArtifactReference rootRef = new ArtifactReference();
+        rootRef.setGroupId( groupId );
+        rootRef.setArtifactId( artifactId );
+        rootRef.setVersion( version );
+        rootRef.setClassifier( "" );
+        rootRef.setType( "pom" );
+
+        this.rootNode = new DependencyGraphNode( rootRef );
+    }
+
+    public DependencyGraph( DependencyGraphNode root )
+    {
+        this.rootNode = root;
+    }
+
+    public Collection getEdges()
+    {
+        return edges;
+    }
+
+    public Collection getNodes()
+    {
+        return nodes.values();
+    }
+
+    public DependencyGraphNode getRootNode()
+    {
+        return rootNode;
+    }
+
+    public void setRootNode( DependencyGraphNode rootNode )
+    {
+        this.rootNode = rootNode;
+    }
+
+    /**
+     * Add the edge to the {@link DependencyGraph}.
+     * 
+     * @param edge the edge to add.
+     */
+    public void addEdge( final DependencyGraphEdge edge )
+    {
+        if ( edge.getNodeFrom() == null )
+        {
+            throw new IllegalArgumentException( "edge.nodeFrom cannot be null." );
+        }
+
+        if ( edge.getNodeTo() == null )
+        {
+            throw new IllegalArgumentException( "edge.nodeTo cannot be null." );
+        }
+
+        this.edges.add( edge );
+    }
+
+    public DependencyGraphNode addNode( DependencyGraphNode node )
+    {
+        if ( node == null )
+        {
+            throw new IllegalArgumentException( "Unable to add a null node." );
+        }
+
+        if ( node.getArtifact() == null )
+        {
+            throw new IllegalArgumentException( "Unable to add a node with a null artifact reference." );
+        }
+
+        int prevNodeIdx = this.nodes.indexOf( node );
+
+        // Found it in the node tree?
+        if ( prevNodeIdx >= 0 )
+        {
+            // Merge new node into existing node.
+            DependencyGraphNode previousNode = (DependencyGraphNode) this.nodes.get( prevNodeIdx );
+
+            if ( CollectionUtils.isNotEmpty( node.getExcludes() ) )
+            {
+                previousNode.getExcludes().addAll( node.getExcludes() );
+            }
+
+            if ( CollectionUtils.isNotEmpty( node.getDependencyManagement() ) )
+            {
+                previousNode.getDependencyManagement().addAll( node.getDependencyManagement() );
+            }
+
+            if ( node.isFromParent() )
+            {
+                previousNode.setFromParent( true );
+            }
+
+            // Return newly merged node (from existing node)
+            return previousNode;
+        }
+
+        // This is a new node, didn't exist before, just save it.
+        this.nodes.put( node.getArtifact(), node );
+
+        return node;
+    }
+
+    public boolean hasNode( DependencyGraphNode node )
+    {
+        return this.nodes.containsKey( node.getArtifact() );
+    }
+
+    public boolean hasEdge( DependencyGraphEdge edge )
+    {
+        return this.edges.contains( edge );
+    }
+
+    /**
+     * Get the list of edges from the provided node.
+     * 
+     * @param node the node to use as the 'from' side of an edge.
+     * @return the edges from the provided node.
+     */
+    public List getEdgesFrom( DependencyGraphNode node )
+    {
+        List ret = new ArrayList();
+        CollectionUtils.select( this.edges, new EdgeFromPredicate( node.getArtifact() ), ret );
+        return ret;
+    }
+
+    /**
+     * Get the list of edges to the provided node.
+     * 
+     * @param node the node to use as the 'to' side of an edge.
+     * @return the edges to the provided node.
+     */
+    public List getEdgesTo( DependencyGraphNode node )
+    {
+        List ret = new ArrayList();
+        CollectionUtils.select( this.edges, new EdgeToPredicate( node.getArtifact() ), ret );
+        return ret;
+    }
+
+    /**
+     * Get the node for the specified artifact reference.
+     * 
+     * @param ref the artifact reference to use to find the node.
+     * @return the node that was found. (null if not found)
+     */
+    public DependencyGraphNode getNode( ArtifactReference ref )
+    {
+        return (DependencyGraphNode) this.nodes.get( ref );
+    }
+
+    public void removeEdge( DependencyGraphEdge edge )
+    {
+        this.edges.remove( edge );
+    }
+
+    public void removeNode( DependencyGraphNode node )
+    {
+        List edges = getEdgesFrom( node );
+        if ( !edges.isEmpty() )
+        {
+            System.out.println( "Removing node left <" + edges + "> hanging <from> edges." );
+        }
+
+        edges = getEdgesTo( node );
+        if ( !edges.isEmpty() )
+        {
+            System.out.println( "Removing node left <" + edges + "> hanging <to> edges." );
+        }
+
+        this.nodes.remove( node.getArtifact() );
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraph.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,51 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.archiva.model.VersionedReference;
+
+/**
+ * DependencyGraphBuilder 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface DependencyGraphBuilder
+{
+    /**
+     * Given a node and a versioned project rexpandeference, resolve the details of the node, creating
+     * any dependencies and edges as needed.
+     * 
+     * @param graph the graph to add nodes and edges to.
+     * @param node the node where the resolution should occur.
+     * @param versionedProjectReference the versioned project reference for the node
+     *                                  that needs to be resolved.
+     */
+    public void resolveNode( DependencyGraph graph, DependencyGraphNode node,
+                             VersionedReference versionedProjectReference );
+
+    /**
+     * Create a new graph, with the root of the graph for the node specified. 
+     * 
+     * @param versionedProjectReference the root node for the graph.
+     * @return the new DependencyGraph, complete with root node and direct dependencies. 
+     */
+    public DependencyGraph createGraph( VersionedReference versionedProjectReference );
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,188 @@
+package org.apache.maven.archiva.dependency.graph;
+
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.DependencyScope;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * DependencyGraphEdge 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyGraphEdge
+{
+    private ArtifactReference nodeFrom;
+
+    private ArtifactReference nodeTo;
+
+    private String scope;
+    
+    private boolean disabled = false;
+
+    private int disabledType;
+
+    private String disabledReason;
+
+    public DependencyGraphEdge( ArtifactReference fromNode, ArtifactReference toNode )
+    {
+        super();
+        this.nodeFrom = fromNode;
+        this.nodeTo = toNode;
+        this.scope = DependencyScope.COMPILE;
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+        {
+            return true;
+        }
+        if ( obj == null )
+        {
+            return false;
+        }
+        if ( getClass() != obj.getClass() )
+        {
+            return false;
+        }
+        final DependencyGraphEdge other = (DependencyGraphEdge) obj;
+        if ( nodeFrom == null )
+        {
+            if ( other.nodeFrom != null )
+            {
+                return false;
+            }
+        }
+        else if ( !nodeFrom.equals( other.nodeFrom ) )
+        {
+            return false;
+        }
+        if ( nodeTo == null )
+        {
+            if ( other.nodeTo != null )
+            {
+                return false;
+            }
+        }
+        else if ( !nodeTo.equals( other.nodeTo ) )
+        {
+            return false;
+        }
+        return true;
+    }
+
+    public String getDisabledReason()
+    {
+        return disabledReason;
+    }
+
+    public int getDisabledType()
+    {
+        return disabledType;
+    }
+
+    public ArtifactReference getNodeFrom()
+    {
+        return nodeFrom;
+    }
+
+    public ArtifactReference getNodeTo()
+    {
+        return nodeTo;
+    }
+
+    public String getScope()
+    {
+        return scope;
+    }
+
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ( ( nodeFrom == null ) ? 0 : nodeFrom.hashCode() );
+        result = PRIME * result + ( ( nodeTo == null ) ? 0 : nodeTo.hashCode() );
+        return result;
+    }
+
+    public boolean isDisabled()
+    {
+        return disabled;
+    }
+
+    public void setDisabled( boolean disabled )
+    {
+        this.disabled = disabled;
+        if( this.disabled == false )
+        {
+            this.disabledReason = null;
+            this.disabledType = -1;
+        }
+    }
+
+    public void setDisabledReason( String disabledReason )
+    {
+        this.disabledReason = disabledReason;
+    }
+
+    public void setDisabledType( int disabledType )
+    {
+        this.disabledType = disabledType;
+    }
+    
+    public void setNodeFrom( ArtifactReference ref )
+    {
+        this.nodeFrom = ref;
+    }
+
+    public void setNodeFrom( DependencyGraphNode node )
+    {
+        this.nodeFrom = node.getArtifact();
+    }
+    
+    public void setNodeTo( ArtifactReference ref )
+    {
+        this.nodeTo = ref;
+    }
+
+    public void setNodeTo( DependencyGraphNode node )
+    {
+        this.nodeTo = node.getArtifact();
+    }
+
+    public void setScope( String scope )
+    {
+        this.scope = scope;
+    }
+
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+
+        sb.append( "GraphEdge[" );
+        sb.append( "from=" ).append( DependencyGraphKeys.toKey( nodeFrom ) );
+        sb.append( ",to=" ).append( DependencyGraphKeys.toKey( nodeTo ) );
+        sb.append( "]" );
+
+        return sb.toString();
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphEdge.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,79 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.commons.lang.StringUtils;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.Dependency;
+import org.apache.maven.archiva.model.Exclusion;
+
+/**
+ * Key generation for the various objects used within the DependencyGraph. 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyGraphKeys
+{
+    public static String toManagementKey( DependencyGraphNode node )
+    {
+        return toManagementKey( node.getArtifact() );
+    }
+
+    public static String toManagementKey( ArtifactReference ref )
+    {
+        StringBuffer key = new StringBuffer();
+        key.append( ref.getGroupId() ).append( ":" );
+        key.append( ref.getArtifactId() );
+        return key.toString();
+    }
+
+    public static String toManagementKey( Dependency ref )
+    {
+        StringBuffer key = new StringBuffer();
+        key.append( ref.getGroupId() ).append( ":" );
+        key.append( ref.getArtifactId() );
+        return key.toString();
+    }
+
+    public static String toManagementKey( Exclusion ref )
+    {
+        StringBuffer key = new StringBuffer();
+        key.append( ref.getGroupId() ).append( ":" );
+        key.append( ref.getArtifactId() );
+        return key.toString();
+    }
+
+    public static String toKey( DependencyGraphNode node )
+    {
+        return toKey( node.getArtifact() );
+    }
+
+    public static String toKey( ArtifactReference ref )
+    {
+        StringBuffer key = new StringBuffer();
+        key.append( ref.getGroupId() ).append( ":" );
+        key.append( ref.getArtifactId() ).append( ":" );
+        key.append( ref.getVersion() ).append( ":" );
+        key.append( StringUtils.defaultString( ref.getClassifier() ) ).append( ":" );
+        key.append( ref.getType() );
+        return key.toString();
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphKeys.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,191 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.Dependency;
+import org.apache.maven.archiva.model.Exclusion;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * DependencyGraphNode 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyGraphNode
+{
+    /**
+     * The artifact reference for this node.
+     */
+    private ArtifactReference artifact;
+
+    /**
+     * The project level dependency management section for this artifact.
+     */
+    private List dependencyManagement = new ArrayList();
+
+    /**
+     * The list of excluded groupId:artifactId for this node's sub-nodes. 
+     */
+    private Set excludes = new HashSet();
+
+    /**
+     * Flag indicating that this node has been resolved from disk.
+     * Initially this is set to false, when the node is added due to a dependency entry in the
+     * project's pom.
+     * When the resolver comes through and reads the model for this node, it sets this to true.
+     */
+    private boolean resolved = false;
+    
+    /**
+     * Flag indicating that this dependency exists because of a parent dependency.
+     * TODO: move this to DependencyGraphEdge (where it really belongs)
+     */
+    private boolean fromParent = false;
+
+    /**
+     * Booleaning indicating that this node is in conflict with another node in the graph.
+     * If this is true, that means this node is flagged for removal.
+     */
+    private boolean conflicted = false;
+
+    public DependencyGraphNode( ArtifactReference artifact )
+    {
+        super();
+        this.artifact = artifact;
+    }
+
+    public void addExclude( Exclusion exclusion )
+    {
+        this.excludes.add( DependencyGraphKeys.toManagementKey( exclusion ) );
+    }
+
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+        {
+            return true;
+        }
+        if ( obj == null )
+        {
+            return false;
+        }
+        if ( getClass() != obj.getClass() )
+        {
+            return false;
+        }
+        final DependencyGraphNode other = (DependencyGraphNode) obj;
+        if ( artifact == null )
+        {
+            if ( other.artifact != null )
+            {
+                return false;
+            }
+        }
+        else if ( !artifact.equals( other.artifact ) )
+        {
+            return false;
+        }
+        return true;
+    }
+
+    public ArtifactReference getArtifact()
+    {
+        return artifact;
+    }
+
+    public List getDependencyManagement()
+    {
+        return dependencyManagement;
+    }
+
+    public Set getExcludes()
+    {
+        return excludes;
+    }
+
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ( ( artifact == null ) ? 0 : artifact.hashCode() );
+        return result;
+    }
+
+    public boolean isConflicted()
+    {
+        return conflicted;
+    }
+
+    public boolean isResolved()
+    {
+        return resolved;
+    }
+
+    public void addDependencyManagement( Dependency dep )
+    {
+        this.dependencyManagement.add( dep );
+    }
+
+    public void setArtifact( ArtifactReference artifact )
+    {
+        this.artifact = artifact;
+    }
+
+    public void setConflicted( boolean conflicted )
+    {
+        this.conflicted = conflicted;
+    }
+
+    public void setDependencyManagement( List dependencyManagement )
+    {
+        this.dependencyManagement = dependencyManagement;
+    }
+
+    public void setExcludes( Set excludes )
+    {
+        this.excludes = excludes;
+    }
+
+    public void setResolved( boolean resolved )
+    {
+        this.resolved = resolved;
+    }
+
+    public String toString()
+    {
+        return DependencyGraphKeys.toKey( artifact );
+    }
+
+    public boolean isFromParent()
+    {
+        return fromParent;
+    }
+
+    public void setFromParent( boolean fromParent )
+    {
+        this.fromParent = fromParent;
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,289 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections.functors.AndPredicate;
+import org.apache.commons.collections.functors.NotPredicate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.dependency.graph.functors.NodePredicate;
+import org.apache.maven.archiva.dependency.graph.functors.OrphanedNodePredicate;
+import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.Dependency;
+import org.apache.maven.archiva.model.DependencyScope;
+import org.apache.maven.archiva.model.Exclusion;
+import org.apache.maven.archiva.model.VersionedReference;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Utilities for manipulating the DependencyGraph. 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyGraphUtils
+{
+    /**
+     * Standard way to add a model to the graph.
+     * 
+     * NOTE: Used by archiva-repository-layer runtime and archiva-dependency-graph tests.
+     * 
+     * @param model the model to add
+     * @param graph the graph to add it to
+     * @param fromNode the node to add it from.
+     */
+    public static void addNodeFromModel( ArchivaProjectModel model, DependencyGraph graph, DependencyGraphNode fromNode )
+    {
+        if ( model == null )
+        {
+            throw new IllegalStateException( "Unable to add null model for "
+                + DependencyGraphKeys.toKey( fromNode.getArtifact() ) );
+        }
+
+        if ( model.getRelocation() != null )
+        {
+            // We need to CHANGE this node.
+            ArtifactReference refTO = new ArtifactReference();
+
+            refTO.setGroupId( fromNode.getArtifact().getGroupId() );
+            refTO.setArtifactId( fromNode.getArtifact().getArtifactId() );
+            refTO.setVersion( fromNode.getArtifact().getVersion() );
+            refTO.setClassifier( fromNode.getArtifact().getClassifier() );
+            refTO.setType( fromNode.getArtifact().getType() );
+
+            VersionedReference relocation = model.getRelocation();
+
+            if ( StringUtils.isNotBlank( relocation.getGroupId() ) )
+            {
+                refTO.setGroupId( relocation.getGroupId() );
+            }
+
+            if ( StringUtils.isNotBlank( relocation.getArtifactId() ) )
+            {
+                refTO.setArtifactId( relocation.getArtifactId() );
+            }
+
+            if ( StringUtils.isNotBlank( relocation.getVersion() ) )
+            {
+                refTO.setVersion( relocation.getVersion() );
+            }
+
+            DependencyGraphNode nodeTO = new DependencyGraphNode( refTO );
+
+            graph.addNode( nodeTO );
+            collapseNodes( graph, fromNode, nodeTO );
+            return;
+        }
+
+        boolean isRootNode = graph.getRootNode().equals( fromNode );
+
+        Iterator it;
+
+        if ( CollectionUtils.isNotEmpty( model.getDependencyManagement() ) )
+        {
+            it = model.getDependencyManagement().iterator();
+            while ( it.hasNext() )
+            {
+                Dependency dependency = (Dependency) it.next();
+                fromNode.addDependencyManagement( dependency );
+            }
+        }
+
+        if ( CollectionUtils.isNotEmpty( model.getDependencies() ) )
+        {
+            it = model.getDependencies().iterator();
+            while ( it.hasNext() )
+            {
+                Dependency dependency = (Dependency) it.next();
+
+                String scope = dependency.getScope();
+
+                // Test scopes *NOT* from root node can be skipped.
+                if ( DependencyScope.TEST.equals( scope ) && !isRootNode )
+                {
+                    // skip add of test scope
+                    continue;
+                }
+
+                ArtifactReference artifactRef = new ArtifactReference();
+                artifactRef.setGroupId( dependency.getGroupId() );
+                artifactRef.setArtifactId( dependency.getArtifactId() );
+                artifactRef.setVersion( dependency.getVersion() );
+                artifactRef.setClassifier( dependency.getClassifier() );
+                artifactRef.setType( dependency.getType() );
+
+                DependencyGraphNode toNode = new DependencyGraphNode( artifactRef );
+
+                if ( CollectionUtils.isNotEmpty( dependency.getExclusions() ) )
+                {
+                    Iterator itexclusion = dependency.getExclusions().iterator();
+                    while ( itexclusion.hasNext() )
+                    {
+                        Exclusion exclusion = (Exclusion) itexclusion.next();
+                        toNode.addExclude( exclusion );
+                    }
+                }
+
+                if ( dependency.isFromParent() )
+                {
+                    toNode.setFromParent( true );
+                }
+
+                // Add node (to)
+                graph.addNode( toNode );
+
+                DependencyGraphEdge edge = new DependencyGraphEdge( fromNode.getArtifact(), toNode.getArtifact() );
+                edge.setScope( StringUtils.defaultIfEmpty( dependency.getScope(), DependencyScope.COMPILE ) );
+
+                if ( dependency.isOptional() )
+                {
+                    edge.setDisabled( true );
+                    edge.setDisabledType( DependencyGraph.DISABLED_OPTIONAL );
+                    edge.setDisabledReason( "Optional Dependency" );
+                }
+
+                graph.addEdge( edge );
+            }
+        }
+
+        fromNode.setResolved( true );
+        graph.addNode( fromNode );
+    }
+
+    /**
+     * Clean out any nodes that may have become orphaned in the graph.
+     * 
+     * @param graph the graph to check.
+     */
+    public static void cleanupOrphanedNodes( DependencyGraph graph )
+    {
+        boolean done = false;
+
+        Predicate orphanedNodePredicate = new OrphanedNodePredicate( graph );
+        Predicate notRootNode = NotPredicate.getInstance( new NodePredicate( graph.getRootNode().getArtifact() ) );
+        Predicate orphanedChildNodePredicate = AndPredicate.getInstance( notRootNode, orphanedNodePredicate );
+
+        while ( !done )
+        {
+            // Find orphaned node.
+            DependencyGraphNode orphanedNode = (DependencyGraphNode) CollectionUtils.find( graph.getNodes(),
+                                                                                           orphanedChildNodePredicate );
+
+            if ( orphanedNode == null )
+            {
+                done = true;
+                break;
+            }
+
+            // Remove edges FROM orphaned node.
+            List edgesFrom = graph.getEdgesFrom( orphanedNode );
+
+            Iterator it = edgesFrom.iterator();
+            while ( it.hasNext() )
+            {
+                DependencyGraphEdge edge = (DependencyGraphEdge) it.next();
+                graph.removeEdge( edge );
+            }
+
+            // Remove orphaned node.
+            graph.removeNode( orphanedNode );
+        }
+    }
+
+    /**
+     * Functionaly similar to {@link #collapseVersions(DependencyGraph, ArtifactReference, String, String)}, but 
+     * in a new, easier to use, format.
+     * 
+     * 1) Removes the FROM edges connected to the FROM node
+     * 2) Moves the TO edges connected to the FROM node to the TO node.
+     * 3) Removes the FROM node (which is now orphaned)  
+     *  
+     * @param graph the graph to perform operation on
+     * @param nodeFrom the node to collapse from
+     * @param nodeTo the node to collapse to
+     */
+    public static void collapseNodes( DependencyGraph graph, DependencyGraphNode nodeFROM, DependencyGraphNode nodeTO )
+    {
+        Iterator it;
+
+        Set edgesToRemove = new HashSet();
+
+        // 1) Remove all of the edge.from references from nodeFROM
+        List fromEdges = graph.getEdgesFrom( nodeFROM );
+        if ( CollectionUtils.isNotEmpty( fromEdges ) )
+        {
+            edgesToRemove.addAll( fromEdges );
+        }
+
+        // 2) Swing all of the edge.to references from nodeFROM to nodeTO.
+        //        System.out.println( "Swinging incoming edges from " + nodeFROM );
+        //        System.out.println( "                          to " + nodeTO );
+        List toEdges = graph.getEdgesTo( nodeFROM );
+        it = toEdges.iterator();
+        while ( it.hasNext() )
+        {
+            DependencyGraphEdge edge = (DependencyGraphEdge) it.next();
+
+            // Identify old edge to remove.
+            edgesToRemove.add( edge );
+
+            // Clone edge, set edge.to and add to graph.
+            DependencyGraphEdge newedge = clone( edge );
+            newedge.setNodeTo( nodeTO );
+            //            System.out.println( "   edge from: " + edge );
+            //            System.out.println( "          to: " + newedge );
+            graph.addEdge( newedge );
+        }
+
+        // Actually remove the old edges.
+        it = edgesToRemove.iterator();
+        while ( it.hasNext() )
+        {
+            DependencyGraphEdge edge = (DependencyGraphEdge) it.next();
+            graph.removeEdge( edge );
+        }
+
+        // 3) Remove the nodeFROM
+        graph.removeNode( nodeFROM );
+    }
+
+    /**
+     * Create a clone of an edge.
+     * 
+     * @param edge the edge to clone.
+     * @return the cloned edge.
+     */
+    public static DependencyGraphEdge clone( DependencyGraphEdge edge )
+    {
+        DependencyGraphEdge cloned = new DependencyGraphEdge( edge.getNodeFrom(), edge.getNodeTo() );
+        cloned.setDisabled( edge.isDisabled() );
+        cloned.setDisabledReason( edge.getDisabledReason() );
+        cloned.setDisabledType( edge.getDisabledType() );
+        cloned.setScope( edge.getScope() );
+
+        return cloned;
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyGraphUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,57 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * DependencyResolutionEvent 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class DependencyResolutionEvent
+{
+    public static final int ADDING_MODEL = 1;
+
+    public static final int DEP_CONFLICT_OMIT_FOR_NEARER = 2;
+
+    public static final int CYCLE_BROKEN = 3;
+
+    public static final int APPLYING_DEPENDENCY_MANAGEMENT = 4;
+
+    private int type;
+
+    private DependencyGraph graph;
+
+    public DependencyResolutionEvent( int type, DependencyGraph graph )
+    {
+        this.type = type;
+        this.graph = graph;
+    }
+
+    public DependencyGraph getGraph()
+    {
+        return graph;
+    }
+
+    public int getType()
+    {
+        return type;
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/DependencyResolutionEvent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,16 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/**
+ * GraphListener 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface GraphListener
+{
+    public void graphError( GraphTaskException e, DependencyGraph currentGraph );
+
+    public void graphPhaseEvent( GraphPhaseEvent event );
+
+    public void dependencyResolutionEvent( DependencyResolutionEvent event );
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,79 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * GraphPhaseEvent 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class GraphPhaseEvent
+{
+    /**
+     * Graph Phase Event Type - New Graph has been created.  No tasks have been run yet.
+     * NOTE: {{@link #getTask()} will be null for this type.
+     */
+    public static final int GRAPH_NEW = 0;
+
+    /**
+     * Graph Phase Event Type - Graph Task is about to run.
+     */
+    public static final int GRAPH_TASK_PRE = 1;
+
+    /**
+     * Graph Phase Event Type - Graph Task has finished.
+     */
+    public static final int GRAPH_TASK_POST = 2;
+
+    /**
+     * Graph Phase Event Type - All Graph Tasks are done.
+     * NOTE: {{@link #getTask()} will be null for this type.
+     */
+    public static final int GRAPH_DONE = 10;
+
+    private int type;
+    
+    private GraphTask task;
+
+    private DependencyGraph graph;
+
+    public GraphPhaseEvent( int type, GraphTask task, DependencyGraph graph )
+    {
+        this.type = type;
+        this.task = task;
+        this.graph = graph;
+    }
+
+    public DependencyGraph getGraph()
+    {
+        return graph;
+    }
+
+    public GraphTask getTask()
+    {
+        return task;
+    }
+
+    public int getType()
+    {
+        return type;
+    }
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphPhaseEvent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java?view=auto&rev=547277
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java (added)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java Thu Jun 14 08:25:42 2007
@@ -0,0 +1,44 @@
+package org.apache.maven.archiva.dependency.graph;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * A Graph Task.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface GraphTask
+{
+    /**
+     * Get the id for this task.
+     * 
+     * @return the id for this task. (used in Exception messages and {@link GraphPhaseEvent})
+     */
+    public String getTaskId();
+
+    /**
+     * Execute the Graph Task.
+     * 
+     * @param graph the graph to execute the task on.
+     */
+    public void executeTask( DependencyGraph graph )
+        throws GraphTaskException;
+}

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/GraphTask.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain