Switch stable branch back to HEAD

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68

xdoc/plugin.jelly

@@ -282,6 +282,8 @@
       <util:available file="${maven.gen.docs}/navigation.xml"> 
         <util:file var="siteNavFile" name="${maven.gen.docs}/navigation.xml"/> 
       </util:available> 
+      <!-- hold onto maven.docs.src for later -->
+      <util:file var="docsSrcFile" name="${maven.docs.src}"/>
 
       <!-- parse the project nav. Someone jellier than me can remove the temp file requirement -->
       <j:set var="reports"
@@ -316,7 +318,10 @@
         <!-- if no such nav file available use sitewide nav file -->
         <j:set var="navFile" value="${siteNavFile}" />
         <util:available file="${file.parentFile.absoluteFile}/navigation.xml">
-          <util:file var="navFile" name="${file.parentFile.absoluteFile}/navigation.xml"/>
+          <!-- dont use current directory navigation.xml if it's in maven.docs.src -->
+          <j:if test="${!(file.parentFile.equals(docsSrcFile))}">
+            <util:file var="navFile" name="${file.parentFile.absoluteFile}/navigation.xml"/>
+          </j:if>
         </util:available>
 
         <!-- parse nav and make it available to the stylesheet -->

xdoc/project.xml

@@ -65,6 +65,9 @@
     <dependency>
       <id>ant</id>
       <version>1.5.3-1</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
     <dependency>
       <id>dom4j</id>
@@ -99,6 +102,10 @@
       <version>20030211.142705</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
+    <dependency>
+      <id>commons-logging</id>
+      <version>1.0.3</version>
+    </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>

xdoc/src/main/org/apache/maven/DependencyDescriberBean.java

@@ -60,15 +60,20 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.maven.project.Dependency;
 import org.apache.maven.project.Project;
 
 /**
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
- * @version $Id: DependencyDescriberBean.java,v 1.1 2003/07/25 22:47:30 michal Exp $
+ * @version $Id: DependencyDescriberBean.java,v 1.2 2003/08/19 04:45:06 dion Exp $
  */
 public class DependencyDescriberBean
 {
+    /** for debug output */
+    private Log log = LogFactory.getLog(DependencyDescriberBean.class);
+    
     /** */
     private List dependencies = new ArrayList();
     private Project project;
@@ -100,7 +105,7 @@ public class DependencyDescriberBean
             Project resolvedProject = resolveProject(dependency);
             if (resolvedProject != null)
             {
-                System.out.println("POM URL:" + resolvedProject.getUrl());
+                log.debug("POM URL:" + resolvedProject.getUrl());
                 describedDependency.setUrl(resolvedProject.getUrl());
                 describedDependency.setDescription(
                     resolvedProject.getDescription());
@@ -145,13 +150,13 @@ public class DependencyDescriberBean
             }
             else
             {
-                System.out.println("Failed to read POM:" + projectFile);
+                log.debug("Failed to read POM:" + projectFile);
                 return null;
             }
         }
         catch (Exception e)
         {
-            System.out.println("Failed to read POM:" + projectFile);
+            log.debug("Failed to read POM:" + projectFile);
             return null;
         }
     }

xdoc/src/plugin-resources/css/tigris.css

@@ -1,4 +1,4 @@
-/* $Id: tigris.css,v 1.2 2003/08/04 14:56:59 dion Exp $
+/* $Id: tigris.css,v 1.3 2003/08/19 04:45:08 dion Exp $
 	
 	This file defines basic default formatting for HTML conforming to Tigris application style. To extend or override these rules for your instance, edit inst.css instead of this file. */
 

xdoc/src/plugin-resources/templates/cvs-usage.xml

@@ -29,7 +29,7 @@
       </section>
       #end
     
-      #if ($repository.connection)
+      #if ($repository.connection && $repository.connection != '')
       <section name="Anonymous CVS Access">
         <p>
           This project's CVS repository can be checked out through anonymous (pserver)
@@ -49,7 +49,7 @@
       </section>
       #end
 
-      #if ($repository.developerConnection)
+      #if ($repository.developerConnection && $repository.developerConnection != '')
         #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username'))
         #set ($module = $repository.getCvsModule($repository.developerConnection))
         #set ($server = $repository.getCvsServer($repository.developerConnection))

xdoc/xdocs/changes.xml

@@ -7,6 +7,10 @@
 
   <body>
     <release version="1.4" date="in CVS">
+      <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.
+      </action>
       <action dev="michal" type="update">
         Dependency report was completely rewritten.
         Report generator is now aware of notion of type and groupId.