From 515843c2fe5989684358f755eb990874dfebb3d0 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Fri, 28 Aug 2009 23:43:57 +0000
Subject: [PATCH] o Restored backward-compat with 2.x where the metadata source
 is effectively available with two role hints

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809066 13f79535-47bb-0310-9956-ffa450edef68
---
 .../artifact/DefaultMetadataSource.java       | 37 +++++++++++++++++++
 .../project/artifact/MavenMetadataSource.java |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java

diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
new file mode 100644
index 0000000000..d02110777c
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
@@ -0,0 +1,37 @@
+package org.apache.maven.project.artifact;
+
+/*
+ * 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.artifact.metadata.ArtifactMetadataSource;
+import org.codehaus.plexus.component.annotations.Component;
+
+/**
+ * This realizes the metadata source via the default hint to provide backward-compat with Maven 2.x whose Plexus version
+ * registered component descriptors twice: once keyed by role+roleHint and once keyed by role only. This effectively
+ * made the metadata source available with its original role hint ("maven") as well as the default hint.
+ * 
+ * @author Benjamin Bentmann
+ */
+@Component( role = ArtifactMetadataSource.class )
+public class DefaultMetadataSource
+    extends MavenMetadataSource
+{
+
+}
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 8caf19cd05..fc2b24b3ed 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -68,7 +68,7 @@ import org.codehaus.plexus.logging.Logger;
 /**
  * @author Jason van Zyl
  */
-@Component(role = ArtifactMetadataSource.class)
+@Component( role = ArtifactMetadataSource.class, hint = "maven" )
 public class MavenMetadataSource
     implements ArtifactMetadataSource
 {