From 4f44eaddf3a1e762fbac7dda908e552924a3079c Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Fri, 26 Oct 2007 20:57:39 +0000 Subject: [PATCH] Restoring ability to use webdav wagon by fixing WagonManager's use of new active collections in the container, and fixing the active collections to scan descendant realms for qualifying components. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@588777 13f79535-47bb-0310-9956-ffa450edef68 --- .../lifecycle/DefaultLifecycleExecutor.java | 26 +++++++++---------- .../apache/maven/embedder/MavenEmbedder.java | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java index 35b8c9732f..c83ebca2e9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java @@ -148,19 +148,19 @@ public class DefaultLifecycleExecutor rootProject ); // FIXME: This should be handled by the extension scanner. - try - { - Map handlers = findArtifactTypeHandlers( session ); - - artifactHandlerManager.addHandlers( handlers ); - } - catch ( PluginNotFoundException e ) - { - throw new LifecycleExecutionException( - "Plugin could not be not found while searching for artifact-type handlers.", - rootProject, - e ); - } +// try +// { +// Map handlers = findArtifactTypeHandlers( session ); +// +// artifactHandlerManager.addHandlers( handlers ); +// } +// catch ( PluginNotFoundException e ) +// { +// throw new LifecycleExecutionException( +// "Plugin could not be not found while searching for artifact-type handlers.", +// rootProject, +// e ); +// } executeTaskSegments( taskSegments, diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index 91c89f5729..78871ea9af 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -470,12 +470,12 @@ public class MavenEmbedder MavenProject project = readProject( request.getPom() ); - Map handlers = findArtifactTypeHandlers( project ); +// Map handlers = findArtifactTypeHandlers( project ); //TODO: ok this is crappy, now there are active collections so when new artifact handlers // enter the system they should be available. - artifactHandlerManager.addHandlers( handlers ); +// artifactHandlerManager.addHandlers( handlers ); } catch ( MavenEmbedderException e ) {