diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index e54d8655fd..3931616068 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -1288,7 +1288,7 @@ public class DefaultPluginManager // Fire the event ComponentDiscoveryEvent event = new ComponentDiscoveryEvent( componentSetDescriptor ); - manager.fireComponentDiscoveryEvent( event ); + componentDiscovererManager.fireComponentDiscoveryEvent( event ); } catch ( IOException ex ) { @@ -1305,7 +1305,7 @@ public class DefaultPluginManager public void setManager( ComponentDiscovererManager manager ) { - this.manager = manager; + this.componentDiscovererManager = manager; } // ---------------------------------------------------------------------- @@ -1316,7 +1316,7 @@ public class DefaultPluginManager private Map pluginIdsByPrefix = new HashMap(); - private ComponentDiscovererManager manager; + private ComponentDiscovererManager componentDiscovererManager; public void componentDiscovered( ComponentDiscoveryEvent event ) { diff --git a/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java b/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java index 6b2610695f..ac40d05759 100644 --- a/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java +++ b/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java @@ -1,50 +1,35 @@ /* -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. -*/ + * 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. + */ package org.apache.maven.repository; -import java.io.IOException; - +import org.codehaus.plexus.PlexusTestCase; /** - * - * + * + * * @author Oleg Gusakov * @version $Id$ - * + * */ public class LegacyMavenRepositorySystemTest -extends AbstractMavenRepositorySystemTest + extends PlexusTestCase { protected void setUp() throws Exception { - super.setUp(); - - _mrs = getContainer().lookup( RepositorySystem.class, "default" ); - } - - // TODO: 2009-03-Oleg : turned it off till we figure out which methods work, which don't - @Override - public void testRetrieve() - throws IOException - { -// super.testRetrieve(); + lookup( RepositorySystem.class, "default" ); } } diff --git a/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java b/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java similarity index 96% rename from maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java rename to maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java index 780cd7d028..3b77847c39 100644 --- a/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java +++ b/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.maven.repository; +package org.apache.maven.repository.mercury; import java.io.File; import java.io.IOException; @@ -35,13 +35,12 @@ import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; -import org.apache.maven.artifact.versioning.ArtifactVersion; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.mercury.util.FileUtil; +import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; -import org.sonatype.plexus.jetty.DefaultServletContainer; +import org.codehaus.plexus.util.FileUtils; import org.sonatype.plexus.webcontainer.ServletContainer; /** diff --git a/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java b/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java index 0651ac1fd4..20fdccdfe3 100644 --- a/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java +++ b/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java @@ -19,7 +19,6 @@ under the License. package org.apache.maven.repository.mercury; -import org.apache.maven.repository.AbstractMavenRepositorySystemTest; import org.apache.maven.repository.RepositorySystem; /** diff --git a/maven-repository/pom.xml b/maven-repository/pom.xml index c8c168d348..845860e146 100644 --- a/maven-repository/pom.xml +++ b/maven-repository/pom.xml @@ -33,74 +33,29 @@ under the License. org.apache.maven maven-model - - + org.codehaus.plexus plexus-utils - - + org.apache.maven maven-compat - - + org.codehaus.plexus plexus-container-default - - + org.apache.maven.wagon wagon-file test - - + org.sonatype.plexus plexus-jetty6 test - - - - org.sonatype.spice - plexus-webdav - test - - - - org.apache.maven.mercury - mercury-util - test - - - - org.apache.maven.mercury - mercury-logging - ${mercuryVersion} - test - - - - org.apache.maven.mercury - mercury-event - ${mercuryVersion} - test - - - - commons-cli - commons-cli - test - - - - org.apache.maven.mercury - mercury-crypto-basic - ${mercuryVersion} - test - - + @@ -117,7 +72,6 @@ under the License. - org.apache.maven.plugins maven-jar-plugin @@ -129,8 +83,7 @@ under the License. - - +