Author: vsiveton
Date: Fri Jul 15 15:55:33 2005
New Revision: 219253
URL: http://svn.apache.org/viewcvs?rev=219253&view=rev
Log:
Upgraded to plexus-site-renderer-1.0-alpha-2 and corrected a NPE
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=219253&r1=219252&r2=219253&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Fri Jul 15
15:55:33 2005
@@ -48,7 +48,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-site-renderer</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-20050715.080727-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=219253&r1=219252&r2=219253&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
Fri Jul 15 15:55:33 2005
@@ -548,6 +548,11 @@
}
});
+ if ( ( directories == null ) || ( directories.length == 0 ) )
+ {
+ return false;
+ }
+
List indexFound = new ArrayList();
for ( int i = 0; i < directories.length; i++ )
{
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=219253&r1=219252&r2=219253&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
Fri Jul 15 15:55:33 2005
@@ -39,27 +39,26 @@
#end
#end
+#macro ( displayTree $display $item)
+ #if ( $item.getChildren() && $item.getChildCount() > 0 )
+ #foreach( $subitem in $item.getChildren() )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute(
"href" ), $relativePath ) )
+ #set ( $subitemHref = $$subitemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $currentFileName == $subitemHref )
+ #set ( $display = true )
+ #end
+
+ #displayTree($display $subitem)
+ #end
+ #end
+#end
+
#macro ( menuItem $item )
#set ( $collapse = "none" )
#set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute(
"href" ), $relativePath ) )
#set ( $currentFileName = $currentFileName.replaceAll( "\\", "/" ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
- #set ( $currentFileNameLastSlash = $currentFileName.lastIndexOf( "/" ) )
- #if ( $currentFileNameLastSlash != -1)
- #set ( $currentFileNameTmp = $currentFileName.substring( 0,
$currentFileNameLastSlash ) )
- #else
- #set ( $currentFileNameTmp = $currentFileName.substring( 0,
$currentFileName.lengh() ) )
- #end
-
- #set ( $currentItemHrefLastSlash = $currentItemHref.lastIndexOf( "/" ) )
- #if ( $currentItemHrefLastSlash != -1)
- #set ( $currentItemHrefTmp = $currentItemHref.substring( 0,
$currentItemHrefLastSlash ) )
- #else
- #set ( $currentItemHrefTmp = $currentItemHref.substring( 0,
$currentItemHref.lengh() ) )
- #end
-
- #set ( $tree = $currentFileNameTmp && $currentItemHrefTmp &&
$currentFileNameTmp.startsWith( $currentItemHrefTmp ) )
#if ( $item.getChildCount() > 0 )
#if ( ( $item.getAttribute( "collapse" ) ) && ( $item.getAttribute(
"collapse" ).equalsIgnoreCase( "false" ) ) )
@@ -68,31 +67,29 @@
## By default collapsed
#set ( $collapse = "collapsed" )
#end
-
- #if ( $currentFileName == $currentItemHref )
- #set ( $collapse = "expanded" )
- #end
- #if ( $tree )
+ #if ( $currentFileName == $currentItemHref )
#set ( $collapse = "expanded" )
#end
#end
- <li class="$collapse" $currentFileName $currentItemHref>
+ <li class="$collapse">
#if ( $currentFileName == $currentItemHref )
<strong><a href="$currentItemHref">$item.getAttribute( "name"
)</a></strong>
#else
<a href="$currentItemHref">$item.getAttribute( "name" )</a>
#end
</li>
- #if ( $item.getChildren() )
- #if ( $item.getChildCount() > 0 )
- #if ( $collapse == "expanded" || $tree )
- <ul>
- #foreach( $subitem in $item.getChildren() )
- #menuItem( $subitem )
- #end
- </ul>
- #end
+ #if ( $item.getChildren() && $item.getChildCount() > 0 )
+ #set ( $display = false )
+ #set ( $itemTmp = $item )
+ #displayTree($display $itemTmp)
+
+ #if ( $collapse == "expanded" || $display )
+ <ul>
+ #foreach( $subitem in $item.getChildren() )
+ #menuItem( $subitem )
+ #end
+ </ul>
#end
#end
#end
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt?rev=219253&r1=219252&r2=219253&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
Fri Jul 15 15:55:33 2005
@@ -9,4 +9,4 @@
Site Plugin Index
- From /theta/index.apt
+ From /gamma/index.apt
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt?rev=219253&r1=219252&r2=219253&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt
Fri Jul 15 15:55:33 2005
@@ -9,4 +9,4 @@
Site Plugin Index
- From /theta/two/index.apt
+ From /gamma/two/index.apt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
