You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/10/26 22:57:40 UTC
svn commit: r588777 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Author: jdcasey
Date: Fri Oct 26 13:57:39 2007
New Revision: 588777
URL: http://svn.apache.org/viewvc?rev=588777&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=588777&r1=588776&r2=588777&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Fri Oct 26 13:57:39 2007
@@ -148,19 +148,19 @@
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,
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=588777&r1=588776&r2=588777&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Oct 26 13:57:39 2007
@@ -470,12 +470,12 @@
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 )
{