Return-Path: 
 <commits-return-34907-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
X-Original-To: apmail-maven-commits-archive@www.apache.org
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8A13D7705
	for <apmail-maven-commits-archive@www.apache.org>;
 Tue, 23 Aug 2011 22:09:57 +0000 (UTC)
Received: (qmail 68679 invoked by uid 500); 23 Aug 2011 22:09:57 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 68416 invoked by uid 500); 23 Aug 2011 22:09:56 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 68401 invoked by uid 99); 23 Aug 2011 22:09:56 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2011 22:09:56 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2011 22:09:54 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 87F94238889B;
	Tue, 23 Aug 2011 22:09:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1160901 - in /maven/jxr/trunk:
 maven-jxr-plugin/src/it/aggregate/verify.groovy
 maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
 maven-jxr/src/main/resources/templates/index.vm pom.xml
Date: Tue, 23 Aug 2011 22:09:34 -0000
To: commits@maven.apache.org
From: bimargulies@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110823220934.87F94238889B@eris.apache.org>

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>