You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/04/24 17:59:10 UTC
svn commit: r1096338 - in /maven/maven-3/trunk/maven-plugin-api: ./
src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
src/main/mdo/lifecycle.mdo src/site/site.xml
Author: hboutemy
Date: Sun Apr 24 15:59:10 2011
New Revision: 1096338
URL: http://svn.apache.org/viewvc?rev=1096338&view=rev
Log:
[MNG-5076] improved documentation of lifecycle.xml
Submitted by: Benson Margulies
applied with modifications
merged from 2.2 branch r1096335
Modified:
maven/maven-3/trunk/maven-plugin-api/ (props changed)
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java (props changed)
maven/maven-3/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo
maven/maven-3/trunk/maven-plugin-api/src/site/site.xml
Propchange: maven/maven-3/trunk/maven-plugin-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Apr 24 15:59:10 2011
@@ -0,0 +1,9 @@
+/maven/components/branches/MNG-3932-1/maven-plugin-api:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-plugin-api:680477
+/maven/components/branches/maven-2.0.x/maven-plugin-api:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-plugin-api:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-plugin-api:738973-739966
+/maven/components/sisbell-plugin-manager/maven-plugin-api:738757-738972
+/maven/components/trunk/maven-plugin-api:751453-767358,767708-768832
+/maven/maven-2/branches/maven-2.2.x/maven-plugin-api:795521
+/maven/maven-2/branches/maven-2.2.x/maven-plugin-descriptor:1096335
Propchange: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 24 15:59:10 2011
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:688587-696625,696644-699681
+/maven/maven-2/branches/maven-2.2.x/maven-plugin-descriptor/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:1096335
Modified: maven/maven-3/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo?rev=1096338&r1=1096337&r2=1096338&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo (original)
+++ maven/maven-3/trunk/maven-plugin-api/src/main/mdo/lifecycle.mdo Sun Apr 24 15:59:10 2011
@@ -24,7 +24,8 @@ under the License.
<id>lifecycle-mappings</id>
<name>LifecycleMappings</name>
<description><![CDATA[
- Configuration of custom lifecycle mappings for the plugin.
+ Configuration of custom lifecycle mappings for the plugin, as generally stored in
+ <code>META-INF/maven/lifecycle.xml</code> in a plugin's jar artifact.
]]></description>
<defaults>
<default>
@@ -36,7 +37,7 @@ under the License.
<class rootElement="true" xml.tagName="lifecycles" xsd.compositor="sequence">
<name>LifecycleConfiguration</name>
<version>1.0.0</version>
- <description>Root element of the lifecycle.xml file.</description>
+ <description><![CDATA[Root element of the <code>lifecycle.xml</code> file.]]></description>
<fields>
<field>
<name>lifecycles</name>
Modified: maven/maven-3/trunk/maven-plugin-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/site/site.xml?rev=1096338&r1=1096337&r2=1096338&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/src/site/site.xml (original)
+++ maven/maven-3/trunk/maven-plugin-api/src/site/site.xml Sun Apr 24 15:59:10 2011
@@ -1,7 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
+ <menu name="Reference">
+ <item name="lifecycle.xml" href="lifecycle-mappings.html"/>
+ </menu>
<menu ref="parent"/>
<menu ref="reports"/>
</body>