You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/02/25 01:47:26 UTC
svn commit: r747628 - in /maven/mercury/trunk: mercury-it/
mercury-it/src/test/resources/org/apache/maven/mercury/plexus/
mercury-plexus/ mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/
mercury-repo/mercury-repo-remote-m2/src/main/java/or...
Author: ogusakov
Date: Wed Feb 25 00:47:25 2009
New Revision: 747628
URL: http://svn.apache.org/viewvc?rev=747628&view=rev
Log:
[MERCURY-93] - fixing small issues
Added:
maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml
- copied, changed from r747226, maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml
Modified:
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-plexus/pom.xml
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=747628&r1=747627&r2=747628&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Wed Feb 25 00:47:25 2009
@@ -216,6 +216,18 @@
<plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copied: maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml (from r747226, maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml?p2=maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml&p1=maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml&r1=747226&r2=747628&rev=747628&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml (original)
+++ maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.xml Wed Feb 25 00:47:25 2009
@@ -16,13 +16,6 @@
</component>
<component>
- <role>org.apache.maven.mercury.builder.api.DependencyProcessor</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.mercury.MavenDependencyProcessor</implementation>
- <isolated-realm>false</isolated-realm>
- </component>
-
- <component>
<role>org.apache.maven.mercury.plexus.PlexusMercury</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.mercury.plexus.DefaultPlexusMercury</implementation>
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=747628&r1=747627&r2=747628&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Wed Feb 25 00:47:25 2009
@@ -75,11 +75,19 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
-
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- had to move all tests to IT: http://jira.codehaus.org/browse/MERCURY-47 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=747628&r1=747627&r2=747628&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Wed Feb 25 00:47:25 2009
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,7 +85,7 @@
@Configuration( name = "defaultDependencyProcessorHint", value = "maven" )
String _defaultDpHint = "maven";
- @Requirement( role = DependencyProcessor.class )
+ @Requirement
private Map<String, DependencyProcessor> _dependencyProcessors;
// ---------------------------------------------------------------
@@ -110,7 +109,11 @@
{
return findDependencyProcessor( _defaultDpHint );
}
-
+ // ---------------------------------------------------------------
+ public void setDefaultDependencyProcessorHint( String hint )
+ {
+ _defaultDpHint = hint;
+ }
// ---------------------------------------------------------------
public RemoteRepositoryM2 constructRemoteRepositoryM2( String id, URL serverUrl, String serverUser,
String serverPass, URL proxyUrl, String proxyUser,
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java?rev=747628&r1=747627&r2=747628&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java Wed Feb 25 00:47:25 2009
@@ -18,6 +18,9 @@
*/
package org.apache.maven.mercury.repository.remote.m2;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -49,10 +52,9 @@
// ----------------------------------------------------------------------------------
public RemoteRepositoryM2( String url, DependencyProcessor dependencyProcessor )
+ throws MalformedURLException
{
- super( Server.normalizeUrl( url ), DEFAULT_REPOSITORY_TYPE );
- this._server = server;
- setDependencyProcessor( dependencyProcessor );
+ this( new Server( new URL(url) ), dependencyProcessor );
}
// ----------------------------------------------------------------------------------