Author: vsiveton
Date: Wed Jul 13 21:28:06 2005
New Revision: 218985
URL: http://svn.apache.org/viewcvs?rev=218985&view=rev
Log:
MNG-584 and MNG-585: updated the Velocity template and added test case
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
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=218985&r1=218984&r2=218985&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
Wed Jul 13 21:28:06 2005
@@ -41,13 +41,17 @@
#macro ( menuItem $item )
#if ( $item.getChildCount() > 0 )
- #set ( $collapse = "expanded" )
+ #if ( $item.getAttribute( "collapse" ) == "true" )
+ #set ( $collapse = "collapsed" )
+ #else
+ #set ( $collapse = "expanded" )
+ #end
#else
#set ( $collapse = "none" )
#end
#set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute(
"href" ), $relativePath ) )
<li class="$collapse">
- #if ( $currentFileName == $currentItemHref )
+ #if ( $currentFileName.replaceAll('\\', '/') == $currentItemHref )
<strong><a href="$currentItemHref">$item.getAttribute( "name"
)</a></strong>
#else
<a href="$currentItemHref">$item.getAttribute( "name" )</a>
@@ -55,11 +59,13 @@
</li>
#if ( $item.getChildren() )
#if ( $item.getChildCount() > 0 )
+ #if ( $collapse != "collapsed" )
<ul>
#foreach( $subitem in $item.getChildren() )
#menuItem( $subitem )
#end
</ul>
+ #end
#end
#end
#end
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.site.test6</groupId>
+ <artifactId>site-plugin-test6</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2005</inceptionYear>
+ <name>Maven Site Plugin Test6 MNG-584 and MNG-585 issues</name>
+ <description>Test the MNG-584 and MNG-585 issues</description>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+</project>
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test6;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/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/alpha/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /alpha/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/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/alpha/one/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /alpha/one/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/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/alpha/two/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /alpha/two/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/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/beta/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /beta/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/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/beta/one/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /beta/one/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/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/beta/two/index.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Index
+
+ From /beta/beta/index.apt
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Item
+
+Todo
\ No newline at end of file
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<project name="Maven Site">
+ <bannerLeft>
+ <name>Maven Site</name>
+ <src>http://maven.apache.org/images/apache-maven-project.png</src>
+ <href>http://maven.apache.org/</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://maven.apache.org/images/maven-small.gif</src>
+ </bannerRight>
+ <body>
+ <links>
+ <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ </links>
+
+ <!-- Menu in the Left Navigation -->
+ <menu name="Menu Name">
+ <!-- Standalone item -->
+ <item name="Item" href="/item.html" />
+
+ <!-- Uncollapsed Submenu -->
+ <item name="Alpha" href="/alpha/index.html">
+ <item name="Alpha One" href="/alpha/one/index.html"/>
+ <item name="Alpha Two" href="/alpha/two/index.html"/>
+ </item>
+
+ <!-- Collapsed Submenu -->
+ <item name="Beta" href="/beta/index.html" collapse="true">
+ <item name="Beta One" href="/beta/one/index.html" collapse="true"/>
+ <item name="Beta Two" href="/beta/two/index.html" collapse="true"/>
+ </item>
+ </menu>
+ ${reports}
+ </body>
+</project>
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java?rev=218985&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java
Wed Jul 13 21:28:06 2005
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test6;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
