maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r368892 - /maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml
Date Fri, 13 Jan 2006 22:44:42 GMT
Author: ltheussl
Date: Fri Jan 13 14:44:37 2006
New Revision: 368892

URL: http://svn.apache.org/viewcvs?rev=368892&view=rev
Log:
PR: MAVEN-1653
Make the project.xml file in the ten minute test page
comply with maven standarts

Modified:
    maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml

Modified: maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml?rev=368892&r1=368891&r2=368892&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml (original)
+++ maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml Fri Jan 13 14:44:37 2006
@@ -134,8 +134,15 @@
           <tr>
             <td><code>xdocs</code></td>
             <td>
-              This contains the documentation that will be transformed into HTML and published
as a project
-              site.
+              This contains the documentation that will be transformed into
+              HTML and published as a project site.
+              <strong>Note</strong>: by defaulting the xdocs location to the
+              top level directory, Maven 1.x violates the directory structure
+              <a href="../reference/conventions.html#Directory_Structure">conventions</a>
+              adopted in Maven 2, where it defaults to
+              <code>src/site/xdoc</code>. You can make your project
+              layout compatible with Maven 2 by overriding the
+              <code>maven.docs.src</code> property.
             </td>
           </tr>
         </table>
@@ -158,10 +165,15 @@
         <p>
           The following is a basic project descriptor:
         </p>
-        <source><![CDATA[<project>
+        <source><![CDATA[<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+  <pomVersion>3</pomVersion>
+  <id>sample-echo</id>
   <groupId>sample</groupId>
   <artifactId>sample-echo</artifactId>
+  <name>Sample</name>
   <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <inceptionYear>2005</inceptionYear>
   <dependencies>
     <dependency>
       <groupId>log4j</groupId>



Mime
View raw message