svn commit: r809066 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact: DefaultMetadataSource.java MavenMetadataSource.java

[be...@apache.org]

Author: bentmann
Date: Fri Aug 28 23:43:57 2009
New Revision: 809066

URL: http://svn.apache.org/viewvc?rev=809066&view=rev
Log:
o Restored backward-compat with 2.x where the metadata source is effectively available with two role hints

Added:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java   (with props)
Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Added: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java?rev=809066&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java (added)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java Fri Aug 28 23:43:57 2009
@@ -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
+{
+
+}

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=809066&r1=809065&r2=809066&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Fri Aug 28 23:43:57 2009
@@ -68,7 +68,7 @@
 /**
  * @author Jason van Zyl
  */
-@Component(role = ArtifactMetadataSource.class)
+@Component( role = ArtifactMetadataSource.class, hint = "maven" )
 public class MavenMetadataSource
     implements ArtifactMetadataSource
 {