Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o making sure everything is in before merging 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767358 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-04-22 03:34:00 +00:00
parent 8e108fd91a
commit 822f348c93
5 changed files with 32 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -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 )
{

53
maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
View File

@ -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" );
}
}

7
maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java → maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
View File

@ -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;
/**

1
maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
View File

@ -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;
/**

61
maven-repository/pom.xml
View File

@ -33,74 +33,29 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-jetty6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonatype.spice</groupId>
<artifactId>plexus-webdav</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
<version>${mercuryVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
<version>${mercuryVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
<version>${mercuryVersion}</version>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
<build>
@ -117,7 +72,6 @@ under the License.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@ -129,8 +83,7 @@ under the License.
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
</project>