evenisse    2003/08/20 10:20:42

  Modified:    src/plugins-build/xdoc/src/plugin-resources/templates
                        cvs-usage.xml
               src/plugins-build/xdoc/xdocs changes.xml
  Log:
  Fix for MAVEN-698. Fix the broken build if repository/connection is not present.
  
  Revision  Changes    Path
  1.9       +4 -4      
maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml
  
  Index: cvs-usage.xml
  ===================================================================
  RCS file: 
/home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- cvs-usage.xml     19 Aug 2003 04:45:07 -0000      1.8
  +++ cvs-usage.xml     20 Aug 2003 17:20:42 -0000      1.9
  @@ -17,11 +17,9 @@
         </section>
       #else
       
  -      #set ($conn = $repository.getCvsRoot($repository.connection, ''))
  -      #set ($module = $repository.getCvsModule($repository.connection))
         #set ($url = $escape.getText($repository.url))
     
  -      #if ($repository.url)
  +      #if ($repository.url && $repository.url != '')
         <section name="Web Access">
           <p>
             <a href="$url">$url</a>
  @@ -30,6 +28,8 @@
         #end
       
         #if ($repository.connection && $repository.connection != '')
  +        #set ($conn = $repository.getCvsRoot($repository.connection, ''))
  +        #set ($module = $repository.getCvsModule($repository.connection))
         <section name="Anonymous CVS Access">
           <p>
             This project's CVS repository can be checked out through anonymous 
(pserver)
  @@ -75,7 +75,7 @@
         </section>
         #end
   
  -      #if ($repository.url)
  +      #if ($repository.url && $repository.url != '')
         <section name="CVS Access behind a firewall">
    
           <p>
  
  
  
  1.11      +3 -0      maven/src/plugins-build/xdoc/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/changes.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- changes.xml       19 Aug 2003 04:45:08 -0000      1.10
  +++ changes.xml       20 Aug 2003 17:20:42 -0000      1.11
  @@ -7,6 +7,9 @@
   
     <body>
       <release version="1.4" date="in CVS">
  +      <action dev="evenisse" type="fix">
  +        Fix for MAVEN-698. Fix the broken build if repository/connection is not 
present .
  +      </action>
         <action dev="dion" type="fix">
           Fixed bug where top level xdocs were using xdocs/navigation.xml instead of 
the generated
           one when it was available.
  
  
  

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

Reply via email to