You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/12/01 14:12:56 UTC
svn commit: r885758 - in /maven/maven-3/trunk: ./
maven-compat/src/main/java/org/apache/maven/repository/legacy/
maven-compat/src/test/java/org/apache/maven/repository/legacy/
Author: bentmann
Date: Tue Dec 1 13:12:56 2009
New Revision: 885758
URL: http://svn.apache.org/viewvc?rev=885758&view=rev
Log:
[MNG-4474] [regression] Wagon manager does not respect instantiation strategy of wagons
Added:
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java (with props)
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=885758&r1=885757&r2=885758&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Tue Dec 1 13:12:56 2009
@@ -46,6 +46,7 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
@@ -67,9 +68,6 @@
@Requirement
private PlexusContainer container;
- @Requirement(role = Wagon.class)
- private Map<String, Wagon> wagons;
-
@Requirement
private UpdateCheckManager updateCheckManager;
@@ -686,11 +684,16 @@
}
String hint = protocol.toLowerCase( java.util.Locale.ENGLISH );
- Wagon wagon = (Wagon) wagons.get( hint );
- if ( wagon == null )
+ Wagon wagon;
+ try
+ {
+ wagon = container.lookup( Wagon.class, hint );
+ }
+ catch ( ComponentLookupException e )
{
- throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " + protocol );
+ throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
+ + protocol, e );
}
return wagon;
Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java?rev=885758&r1=885757&r2=885758&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java Tue Dec 1 13:12:56 2009
@@ -383,6 +383,17 @@
}
}
+ public void testPerLookupInstantiation()
+ throws Exception
+ {
+ String protocol = "perlookup";
+
+ Wagon one = wagonManager.getWagon( protocol );
+ Wagon two = wagonManager.getWagon( protocol );
+
+ assertNotSame( one, two );
+ }
+
private void assertWagon( String protocol )
throws Exception
{
Added: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java?rev=885758&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java (added)
+++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java Tue Dec 1 13:12:56 2009
@@ -0,0 +1,38 @@
+package org.apache.maven.repository.legacy;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.wagon.Wagon;
+import org.codehaus.plexus.component.annotations.Component;
+
+/**
+ * Wagon with per-lookup instantiation strategy.
+ */
+@Component( role = Wagon.class, hint = "perlookup", instantiationStrategy = "per-lookup" )
+public class PerLookupWagon
+ extends WagonMock
+{
+
+ public String[] getSupportedProtocols()
+ {
+ return new String[] { "perlookup" };
+ }
+
+}
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=885758&r1=885757&r2=885758&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Tue Dec 1 13:12:56 2009
@@ -41,7 +41,7 @@
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
- <plexusVersion>1.5.1</plexusVersion>
+ <plexusVersion>1.5.2</plexusVersion>
<plexusInterpolationVersion>1.11</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>2.0.1</plexusUtilsVersion>