Author: aheritier
Date: Sun Mar  5 15:28:30 2006
New Revision: 383435

URL: http://svn.apache.org/viewcvs?rev=383435&view=rev
Log:
Unify naming maven 1.X -> maven 1.x
Minor fixes (links)

Modified:
    maven/maven-1/core/trunk/xdocs/index.xml
    maven/maven-1/core/trunk/xdocs/navigation.xml
    maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
    maven/maven-1/core/trunk/xdocs/roadmap.xml
    maven/maven-1/core/trunk/xdocs/start/quick-start.xml
    maven/maven-1/core/trunk/xdocs/start/release-notes-LATEST.xml
    maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml
    maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml

Modified: maven/maven-1/core/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/index.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/index.xml (original)
+++ maven/maven-1/core/trunk/xdocs/index.xml Sun Mar  5 15:28:30 2006
@@ -88,7 +88,7 @@
 
       <subsection name="Release Information">
         <p>
-          The current stable release for maven 1 is version 1.0.2 and can be 
obtained from the
+          The current stable release for maven 1.x is version 1.0.2 and can be 
obtained from the
           <a href="start/download.html">download page</a>.
         </p>
         <p>

Modified: maven/maven-1/core/trunk/xdocs/navigation.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/navigation.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/navigation.xml (original)
+++ maven/maven-1/core/trunk/xdocs/navigation.xml Sun Mar  5 15:28:30 2006
@@ -26,7 +26,7 @@
     </breadcrumbs>
 
     <links>
-      <item name="Maven 1.x Plugins" href="/plugins/index.html"/>
+      <item name="Plugins for Maven 1.x" href="/plugins/index.html"/>
       <item name="Maven 2.x" href="http://maven.apache.org/"/>
       <item name="Sitemap" href="/sitemap.html"/>
     </links>
@@ -58,7 +58,7 @@
     <menu name="News and Resources">
       <item name="Road Map" href="/roadmap.html"/>
       <item name="Books and Articles" href="/reference/articles.html"/>
-      <item name="MavenBlogs.com" href="http://www.mavenblogs.com/"; 
target="_blank"/>
+      <item name="Maven Diaries" 
href="http://blogs.codehaus.org/projects/maven/"; target="_blank"/>
       <item name="MavenBook.org" href="http://www.mavenbook.org/"; 
target="_blank"/>
       <item name="PDF Documentation" href="/maven.pdf" img="/images/pdf.gif"/>
     </menu>

Modified: maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml 
(original)
+++ maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml Sun 
Mar  5 15:28:30 2006
@@ -177,7 +177,7 @@
         <p>
           <b>Fix:</b> As above, we recommend not using entities in 
<code>maven.xml</code>, in favour of inheritance
           and plugins. If you want an existing file to work without 
modifications, you should
-          download <a 
href="http://www.ibiblio.org/maven2/xerces/xerces/2.4.0/xerces-2.4.0.jar";>Xerces</a>
 and place it in
+          download <a 
href="http://www.ibiblio.org/maven2/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar";>Xerces</a>
 and place it in
           <code>&lt;JAVA_HOME&gt;/jre/lib/endorsed</code> (this directory may 
need to be created).
         </p>
         <p>

Modified: maven/maven-1/core/trunk/xdocs/roadmap.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/roadmap.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/roadmap.xml (original)
+++ maven/maven-1/core/trunk/xdocs/roadmap.xml Sun Mar  5 15:28:30 2006
@@ -28,7 +28,7 @@
   <body>
     <section name="Roadmap">
       <p>
-        This document details the current plans for the Maven 1.X project.
+        This document details the current plans for the Maven 1.x project.
         Please visit the main <a href="http://maven.apache.org/";>Maven</a>
         page for information on Maven 2.
         More information on the Maven project as a whole can be found in JIRA 
under the

Modified: maven/maven-1/core/trunk/xdocs/start/quick-start.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/quick-start.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/quick-start.xml (original)
+++ maven/maven-1/core/trunk/xdocs/start/quick-start.xml Sun Mar  5 15:28:30 
2006
@@ -51,7 +51,7 @@
         <p>
           The <a href="../reference/properties.html">Properties Reference</a> 
explains how to configure Maven to use
           different locations for the cache and download repository. By 
default, these reside under
-          <code>${user.home}/.maven</code>.
+          <code>$HOME/.maven</code>.
         </p>
         <p>
           The first time a project is built or a specific plugin is used, you 
may need to be online to obtain

Modified: maven/maven-1/core/trunk/xdocs/start/release-notes-LATEST.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/release-notes-LATEST.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/release-notes-LATEST.xml (original)
+++ maven/maven-1/core/trunk/xdocs/start/release-notes-LATEST.xml Sun Mar  5 
15:28:30 2006
@@ -29,7 +29,7 @@
       <p>
 The Apache Maven team is pleased to announce the release of Maven 1.0.2.
 </p><p>
-<a href="download.html">http://maven.apache.org/start/download.html</a>
+<a 
href="download.html">http://maven.apache.org/maven-1.x/start/download.html</a>
 </p><p>
 This release contains further bugfixes since the Maven 1.0 release. In 
addition, all of the latest stable plugin releases are included, which include 
both bugfixes and some new features.
 </p><p>
@@ -59,8 +59,8 @@
 We hope you enjoy using Maven! If you have any questions, please consult:
 </p>
 <ul>
-<li>the FAQ: <a href="../faq.html">http://maven.apache.org/faq.html</a></li>
-<li> the maven-user mailing list: <a 
href="../mail-lists.html">http://maven.apache.org/mail-lists.html</a></li>
+<li>the FAQ: <a 
href="../faq.html">http://maven.apache.org/maven-1.x/faq.html</a></li>
+<li> the maven-user mailing list: <a 
href="../mail-lists.html">http://maven.apache.org/maven-1.x/mail-lists.html</a></li>
 </ul>
 <p>
 For news and information, see:

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=383435&r1=383434&r2=383435&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 Sun Mar  5 
15:28:30 2006
@@ -25,7 +25,7 @@
   </properties>
 
   <body>
-    <section name="The Ten Minute Test - Creating a Project with Maven 1.0">
+    <section name="The Ten Minute Test - Creating a Project with Maven 1.x">
       <p>
         Often when evaluating a new piece of software, you want to give it the 
"ten minute test" - download, install
         and run it, and then do something useful with it within 10 minutes to 
get a feel for how it works. It can be a

Modified: maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml?rev=383435&r1=383434&r2=383435&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml Sun Mar  5 
15:28:30 2006
@@ -30,8 +30,8 @@
     <section name="Developing Plugins">
       <p>
         Adding functionality to Maven is done through the Maven plugin
-        mechanism.  Maven comes shipped with <a 
href="http://maven.apache.org/maven-1.x/plugins/";>numerous plugins</a>,
-        and there are several <a href="../reference/3rdparty.html">3rd party 
plugins</a>.
+        mechanism.  Maven comes shipped with <a 
href="http://maven.apache.org/maven-1.x/plugins/bundled/";>numerous plugins</a>,
+        and there are several <a href="../plugins/3rdparty.html">3rd party 
plugins</a>.
         Plugins can be used to do virtually any task desired.  For example, 
they
         can generate reports, create and deploy software distributions,
         run unit tests, and much more.  This section of the
@@ -212,7 +212,7 @@
 
       <subsection name="Plugin dependencies">
         <p>
-          In maven 1.X, there are only two classloaders :
+          In maven 1.x, there are only two classloaders :
         </p>
         <ul>
           <li>root : Where are loaded ant, commons-logging, log4j.</li>
@@ -222,7 +222,7 @@
           This design can create 2 problems when you write your own plugin :
         </p>
         <ol>
-          <li>You won't be able to use your own version of a dependency. If 
this one is already loaded by maven or one of its plugins in a different 
version you'll automatically use it. To avoid having this sort of problem, you 
are invited to use in priority the libraries versions already used <a 
href="../dependencies.html">by maven</a> or <a 
href="http://maven.apache.org/maven-1.x/plugins/dependency-convergence-report.html";>by
 the bundled plugins</a>.</li>
+          <li>You won't be able to use your own version of a dependency. If 
this one is already loaded by maven or one of its plugins in a different 
version you'll automatically use it. To avoid having this sort of problem, you 
are invited to use in priority the libraries versions already used <a 
href="../dependencies.html">by maven</a> or <a 
href="http://maven.apache.org/maven-1.x/plugins/bundled/dependency-convergence-report.html";>by
 the bundled plugins</a>.</li>
           <li>
             <p>
               If you try to use an Ant task which requires another dependency, 
the ant task doesn't find it even though you defined it correctly in your 
plugin's pom. This due to the fact that ant is loaded in the classloader "root" 
and your dependencies are visible in the classloader "root.maven". To solves 
this, you must specify to maven to load this dependency in the root classloader 
with :


Reply via email to