Author: bimargulies
Date: Tue Aug 23 22:09:33 2011
New Revision: 1160901
URL: http://svn.apache.org/viewvc?rev=1160901&view=rev
Log:
[JXR-93] aggregate goal creates blank top-level report
o improve test to actually notice correct top-level content.
o fix a spelling error.
o update to maven component pom.
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
maven/jxr/trunk/maven-jxr/src/main/resources/templates/index.vm
maven/jxr/trunk/pom.xml
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy?rev=1160901&r1=1160900&r2=1160901&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy Tue Aug 23
22:09:33 2011
@@ -39,5 +39,6 @@ assert content.contains( 'App2.html' );
content = new File( basedir,
'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text;
assert content.contains( 'App2.html' );
-
+content = new File( basedir, 'target/site/xref/index.html' ).text;
+assert content.contains( '<!-- this is a JXR report set -->' );
return true;
\ No newline at end of file
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java?rev=1160901&r1=1160900&r2=1160901&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
Tue Aug 23 22:09:33 2011
@@ -223,7 +223,7 @@ public class DirectoryIndexer
}
catch ( Exception e )
{
- throw new JxrException( "Error initialising Velocity", e );
+ throw new JxrException( "Error initializing Velocity", e );
}
VelocityContext context = new VelocityContext();
Modified: maven/jxr/trunk/maven-jxr/src/main/resources/templates/index.vm
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/resources/templates/index.vm?rev=1160901&r1=1160900&r2=1160901&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr/src/main/resources/templates/index.vm (original)
+++ maven/jxr/trunk/maven-jxr/src/main/resources/templates/index.vm Tue Aug 23
22:09:33 2011
@@ -17,9 +17,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-*#
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
+*#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
<html xml:lang="en" lang="en">
+<!-- this is a JXR report set -->
<head>
<meta http-equiv="content-type" content="text/html;
charset=$outputEncoding" />
<title>$windowTitle</title>
Modified: maven/jxr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1160901&r1=1160900&r2=1160901&view=diff
==============================================================================
--- maven/jxr/trunk/pom.xml (original)
+++ maven/jxr/trunk/pom.xml Tue Aug 23 22:09:33 2011
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
