jvanzyl     2003/02/18 05:57:03

  Modified:    xdocs/reference user-guide.xml
  Log:
  o Reorganizing slightly to create a Maven Setup section.
  o Added section on using multiple remote repositories.
  
  Revision  Changes    Path
  1.43      +114 -93   jakarta-turbine-maven/xdocs/reference/user-guide.xml
  
  Index: user-guide.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/xdocs/reference/user-guide.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- user-guide.xml    17 Feb 2003 18:55:10 -0000      1.42
  +++ user-guide.xml    18 Feb 2003 13:57:03 -0000      1.43
  @@ -27,17 +27,21 @@
                 <li><a href="#Jelly coding">Jelly coding</a></li>
               </ol>
             </li>
  -          <li><a href="#Properties Processing">Properties Processing</a></li>
  -          <li><a href="#Behavioural Properties">Behavioural Properties</a></li>
  -          <li><a href="#Using Proxies">Using Proxies</a></li>
  -          <li><a href="#Setup">Setup</a>
  -            <br/>
  +          <li><a href="#Maven Setup">Maven Setup</a>
  +            <ol>
  +              <li><a href="#Properties Processing">Properties Processing</a></li>
  +              <li><a href="#Plug-in Properties">Plug-in Properties</a></li>
  +              <li><a href="#Behavioural Properties">Behavioural Properties</a></li>
  +              <li><a href="#Using Proxies">Using Proxies</a></li>
  +              <li><a href="#Using Multiple Remote Repositories">Using Multiple 
Remote Repositories</a></li>
  +            </ol>
  +          </li>
  +          <li><a href="#Project Setup">Setup</a>
               <ol>
                 <li><a href="#Starting a New Project">Starting a New Project</a></li>
               </ol>
             </li>
             <li><a href="#Building">Building</a>
  -            <br/>
               <ol>
                 <li><a href="#Build Lifecyle">Build Lifecycle</a></li>
                 <li><a href="#Storing JARs in CVS">Storing JARs in CVS</a></li>
  @@ -504,36 +508,40 @@
         </subsection>
       </section>
   
  -    <section name="Properties Processing">
  -      <p>
  -        The properties files in Maven are processed in the following order:
  -      </p>
  +    <section name="Maven Setup">
   
  -      <p>
  -        <ul>
  -          <li>${maven.home}/bin/driver.properties</li>
  -          <li>${project.home}/project.properties</li>
  -          <li>${project.home}/build.properties</li>
  -          <li>${user.home}/build.properties</li>
  -        </ul>
  -      </p>
  +      <subsection name="Properties Processing">
  +        <p>
  +          The properties files in Maven are processed in the following order:
  +        </p>
   
  -      <p>
  -        Where the last definition wins. So, Maven moves through this sequence
  -        of properties files overridding any previously defined properties with
  -        newer definitions. In this sequence your 
<code>${user.home}/build.properties</code>
  -        has the final say in the list of properties files processed. We will call 
the
  -        list of properties files that Maven processes the standard properties file 
set.
  -      </p>
  +        <p>
  +          <ul>
  +            <li>${maven.home}/bin/driver.properties</li>
  +            <li>${project.home}/project.properties</li>
  +            <li>${project.home}/build.properties</li>
  +            <li>${user.home}/build.properties</li>
  +          </ul>
  +        </p>
   
  -      <p>
  -        In addition, System properties are processed after the above chain of
  -        properties files are processed. So, a property specified on the CLI
  -        using the <code>-Dproperty=value</code> convention will override any
  -        previous definition of that property.
  -      </p>
  +        <p>
  +          Where the last definition wins. So, Maven moves through this sequence
  +          of properties files overridding any previously defined properties with
  +          newer definitions. In this sequence your 
<code>${user.home}/build.properties</code>
  +          has the final say in the list of properties files processed. We will call 
the
  +          list of properties files that Maven processes the standard properties 
file set.
  +        </p>
   
  -      <subsection name="How do Plug-in Properties Work?">
  +        <p>
  +          In addition, System properties are processed after the above chain of
  +          properties files are processed. So, a property specified on the CLI
  +          using the <code>-Dproperty=value</code> convention will override any
  +          previous definition of that property.
  +        </p>
  +
  +      </subsection>
  +
  +      <subsection name="Plug-in Properties">
           <p>
             Plug-ins are loaded after the above sequence of properties files
             are processed but the <code>PluginManager</code> is instructed not
  @@ -581,82 +589,80 @@
          </p>
   
         </subsection>
  -    </section>
   
  -    <section name="Behavioural Properties">
  -      <p>
  -        The following is a list of properties that change the way Maven works.
  -      </p>
  +      <subsection name="Behavioural Properties">
  +        <p>
  +          The following is a list of properties that change the way Maven works.
  +        </p>
  +
  +        <p>
  +          <table>
  +            <tr>
  +              <th>Property</th>
  +              <th>Description</th>
  +              <th>Default Value</th>
  +            </tr>
  +
  +            <tr>
  +              <td>maven.mode.online</td>
  +              <td>
  +              </td>
  +              <td>true</td>
  +            </tr>
  +
  +            <tr>
  +              <td>maven.remote.repo.enabled</td>
  +              <td>
  +              </td>
  +              <td>true</td>
  +            </tr>
  +          </table>
  +        </p>
  +
  +      </subsection>
  +
  +      <subsection name="Using Proxies">
  +        <p>
  +          If you only have access via a proxy then Maven obeys the following
  +          properties.
  +        </p>
   
  -      <p>
           <table>
             <tr>
  -            <th>Property</th>
  +            <th>Proxy Properties</th>
               <th>Description</th>
  -            <th>Default Value</th>
             </tr>
  -
             <tr>
  -            <td>maven.mode.online</td>
  +            <td>maven.proxy.host</td>
               <td>
  +              The IP or address of your proxy.
               </td>
  -            <td>true</td>
             </tr>
  -
             <tr>
  -            <td>maven.remote.repo.enabled</td>
  +            <td>maven.proxy.port</td>
               <td>
  +              The port number of your proxy.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>maven.proxy.username</td>
  +            <td>
  +              User name if your proxy requires authentication.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>maven.proxy.password</td>
  +            <td>
  +              Password if your proxy requires authentication.
               </td>
  -            <td>true</td>
             </tr>
  -
           </table>
  -      </p>
   
  -    </section>
  -
  -    <section name="Using Proxies">
  -      <p>
  -        If you only have access via a proxy then Maven obeys the following
  -        properties.
  -      </p>
  -
  -      <table>
  -        <tr>
  -          <th>Proxy Properties</th>
  -          <th>Description</th>
  -        </tr>
  -        <tr>
  -          <td>maven.proxy.host</td>
  -          <td>
  -            The IP or address of your proxy.
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>maven.proxy.port</td>
  -          <td>
  -            The port number of your proxy.
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>maven.proxy.username</td>
  -          <td>
  -            User name if your proxy requires authentication.
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>maven.proxy.password</td>
  -          <td>
  -            Password if your proxy requires authentication.
  -          </td>
  -        </tr>
  -      </table>
  -
  -      <p>
  -        If you do require a proxy, the most appropriate place to set these
  -        values would be in your <code>${user.home}/build.properties</code>
  -        file.
  -      </p>
  +        <p>
  +          If you do require a proxy, the most appropriate place to set these
  +          values would be in your <code>${user.home}/build.properties</code>
  +          file.
  +        </p>
   
   <source><![CDATA[
   ## ----------------------------------------------------------
  @@ -672,9 +678,24 @@
   .
   ]]></source>
   
  +      </subsection>
  +
  +      <subsection name="Using Multiple Remote Repositories">
  +        <p>
  +          You can specify the use of multiple remote repositories in any of
  +          the properties files processed by Maven by using something like
  +          the following:
  +        </p>
  +
  +<source><![CDATA[
  +maven.repo.remote = http://www.ibiblio.org/maven/,http://www.mycompany.com/maven/
  +]]></source>
  +
  +      </subsection>
  +
       </section>
   
  -    <section name="Setup">
  +    <section name="Project Setup">
           <subsection name="Starting a New Project">
             <p>
               If you using Maven for the first time or starting a new project you
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to