From 787c808d588753ee7f4c2257d088138af03448e5 Mon Sep 17 00:00:00 2001
From: vladt
Date: Tue, 26 Apr 2011 16:39:29 -0400
Subject: 342776: Added support for lifecycle mapping metadata xml files
 referenced as maven artifacts

---
 .../lifecyclemapping/LifecycleMappingFactory.java    |  2 +-
 .../org.eclipse.m2e.discovery.oss/connectors.xml     | 20 ++++++++++++++++++++
 .../org.eclipse.m2e.discovery.oss/pom.xml            |  3 ++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
index 0ec2fe59..2c37468e 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
@@ -111,7 +111,7 @@ public class LifecycleMappingFactory {
 
   public static final String EXTENSION_PROJECT_CONFIGURATORS = IMavenConstants.PLUGIN_ID + ".projectConfigurators"; //$NON-NLS-1$
 
-  private static final String EXTENSION_LIFECYCLE_MAPPING_METADATA_SOURCE = IMavenConstants.PLUGIN_ID
+  public static final String EXTENSION_LIFECYCLE_MAPPING_METADATA_SOURCE = IMavenConstants.PLUGIN_ID
       + ".lifecycleMappingMetadataSource"; //$NON-NLS-1$
 
   private static final String ELEMENT_LIFECYCLE_MAPPING_METADATA = "lifecycleMappingMetadata"; //$NON-NLS-1$
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
index 6e90b1a8..8d5d0680 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/connectors.xml
@@ -35,6 +35,26 @@
   </categories>
   
   <catalogItems>
+    <catalogItem>
+      <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
+      <description>m2e discovery catalog publisher</description>
+      <groupId>lifecycles</groupId>
+      <id>org.sonatype.m2e.discovery.publisher.maven-plugin</id>
+      <kind>lifecycles</kind>
+      <license>EPL</license>
+      <name>m2e discovery catalog publisher</name>
+      <provider>Sonatype, Inc.</provider>
+      <maven>
+        <repositoryUrl>http://repository.sonatype.org/content/groups/public</repositoryUrl>
+        <groupId>org.sonatype.m2e.discovery.publisher</groupId>
+        <artifactId>org.sonatype.m2e.discovery.publisher.maven-plugin</artifactId>
+        <classifier>lifecycle-mapping-metadata</classifier>
+        <version>0.0.1-SNAPSHOT</version>
+      </maven>
+      <overview>
+        <summary>m2e discovery catalog publisher</summary>
+      </overview>
+    </catalogItem>
     <catalogItem>
       <categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
       <description>Tycho Configurator bridges tycho based projects and PDE</description>
diff --git a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
index 895ac9e8..f1816476 100644
--- a/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
+++ b/org.eclipse.m2e.discovery-directory/org.eclipse.m2e.discovery.oss/pom.xml
@@ -53,7 +53,7 @@
     
     <pluginManagement>
       <plugins>
-        <!--TODO TEXT. This plugin's configuration is used in m2e only.-->
+        <!-- This plugin's configuration is used in m2e only.-->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
@@ -71,6 +71,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
+                    <!-- org.sonatype.m2e.discovery.publisher.maven-plugin uses an Equinox instance, so it cannot be executed from within eclipse -->
                     <ignore/>
                   </action>
                 </pluginExecution>
-- 
cgit v1.2.3