From dac191ef445a6b6c631a945c7a949226870d68a6 Mon Sep 17 00:00:00 2001
From: Michal Maczka <michal@apache.org>
Date: Tue, 22 Jun 2004 19:25:54 +0000
Subject: [PATCH] reorganization of some elements of POM

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162830 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-model/maven.mdo | 65 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo
index b40796512e..01d1a5d7f4 100644
--- a/maven-model/maven.mdo
+++ b/maven-model/maven.mdo
@@ -32,7 +32,7 @@
           <version>3.0.0+</version>
           <description>
             The location of the parent project, if one exists. Values from the parent project will be
-            the default for this project if they are left unspecified. 
+            the default for this project if they are left unspecified.
             The path may be absolute, or relative to the current project.xml file.
           </description>
           <type>String</type>
@@ -162,13 +162,13 @@
         </field>
         <field>
           <name>siteAddress</name>
-          <version>3.0.0+</version>
+          <version>3.0.0</version>
           <description>The FQDN of the host where the project's site is uploaded.</description>
           <type>String</type>
         </field>
         <field>
           <name>siteDirectory</name>
-          <version>3.0.0+</version>
+          <version>3.0.0</version>
           <description>The directory on the site host where site documentation is placed when the site is uploaded.</description>
           <type>String</type>
         </field>
@@ -735,6 +735,29 @@
       </fields>
     </class>
     <class>
+<<<<<<< maven.mdo
+      <name>DistributionManagement</name>
+      <version>4.0.0</version>
+      <description>
+        This elements describes all that pertains to distribution for a project.
+      </description>
+      <fields>
+        <field>
+          <name>repository</name>
+          <version>4.0.0</version>
+          <description>Information needed for deploying to remote repository artifacts generated by the project</description>
+          <type>Repository</type>
+        </field>
+        <field>
+          <name>site</name>
+          <description>Information needed for deploying website files of the project.</description>
+          <version>4.0.0</version>
+          <type>Site</type>
+        </field>
+      </fields>
+    </class>
+    <class>
+=======
       <name>DistributionManagement</name>
       <version>4.0.0</version>
       <description>
@@ -756,6 +779,7 @@
       </fields>
     </class>
     <class>
+>>>>>>> 1.41
       <name>License</name>
       <version>3.0.0+</version>
       <fields>
@@ -1218,5 +1242,40 @@
         </codeSegment>
       </codeSegments>
     </class>
+    <!--@todo find better solution for managment of site deployments -->
+    <class>
+      <name>Site</name>
+      <version>4.0.0</version>
+      <description>
+         Site contains the information needed
+         for deploying websites.
+      </description>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>4.0.0</version>
+          <description>
+            A unique identifier for a deployment locataion.
+          </description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>name</name>
+          <version>4.0.0</version>
+          <description>
+            Human readable name of the deployment location
+          </description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>4.0.0</version>
+          <description>
+             The url of of the location where website is deployed
+          </description>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
   </classes>
 </model>