Author: olamy
Date: Mon Dec  7 23:23:42 2009
New Revision: 888183

URL: http://svn.apache.org/viewvc?rev=888183&view=rev
Log:
use doxia released version

Modified:
    maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml

Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=888183&r1=888182&r2=888183&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Mon Dec  7 23:23:42 2009
@@ -34,7 +34,7 @@
   <description>Doxia Converter Tool to convert a supported format to another</description>
 
   <properties>
-    <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
+    <doxiaVersion>1.1.2</doxiaVersion>
   </properties>
 
   <dependencies>

Author: vsiveton
Date: Mon Dec  7 23:01:31 2009
New Revision: 888175

URL: http://svn.apache.org/viewvc?rev=888175&view=rev
Log:
o minor update due to release

Modified:
    maven/doxia/site/pom.xml
    maven/doxia/site/src/site/apt/index.apt

Modified: maven/doxia/site/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=888175&r1=888174&r2=888175&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Mon Dec  7 23:01:31 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>12</version>
+    <version>15</version>
     <relativePath>../../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -136,7 +136,7 @@
   </pluginRepositories>
 
   <properties>
-    <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
+    <doxiaVersion>1.1.2</doxiaVersion>
   </properties>
 
   <build>
@@ -251,7 +251,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -275,13 +275,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
         <configuration>
           <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
           <resolutionIds>Closed</resolutionIds>
           <sortColumnNames>Type,Key</sortColumnNames>
           <maxEntries>1000</maxEntries>
-          <fixVersionIds>15073</fixVersionIds> <!-- 1.1.1 -->
+          <fixVersionIds>15517</fixVersionIds> <!-- 1.1.2 -->
         </configuration>
         <reportSets>
           <reportSet>

Modified: maven/doxia/site/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/index.apt?rev=888175&r1=888174&r2=888175&view=diff
==============================================================================
--- maven/doxia/site/src/site/apt/index.apt (original)
+++ maven/doxia/site/src/site/apt/index.apt Mon Dec  7 23:01:31 2009
@@ -4,7 +4,7 @@
  Jason van Zyl
  Vincent Siveton
  ------
- 2009-05-31
+ 2009-12-07
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -42,11 +42,11 @@
  documentation system of Maven.
  It gives Maven the ability to take any document that Doxia supports and output it any format.
 
- The current version of Doxia is 1.1.1.
+ The current version of Doxia is 1.1.2.
 
 * Maven Doxia Enhancements
 
- * {{{./jira-report.html}Release Notes for 1.1.1}}
+ * {{{./jira-report.html}Release Notes for 1.1.2}}
 
  * {{{./whatsnew-1.1.html}What's new in 1.1}}
 

Author: vsiveton
Date: Mon Nov 30 12:53:23 2009
New Revision: 885407

URL: http://svn.apache.org/viewvc?rev=885407&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml?rev=885407&r1=885406&r2=885407&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml Mon Nov 30 12:53:23 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=885407&r1=885406&r2=885407&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Mon Nov 30 12:53:23 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=885407&r1=885406&r2=885407&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Mon Nov 30 12:53:23 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=885407&r1=885406&r2=885407&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Mon Nov 30 12:53:23 2009
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.doxia</groupId>
   <artifactId>doxia-sitetools</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Doxia Sitetools</name>
@@ -98,9 +98,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/trunk</url>
   </scm>
   <issueManagement>
     <system>jira</system>

Author: vsiveton
Date: Mon Nov 30 12:53:18 2009
New Revision: 885406

URL: http://svn.apache.org/viewvc?rev=885406&view=rev
Log:
[maven-scm] copy for tag doxia-sitetools-1.1.2

Added:
    maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2/
      - copied from r885405, maven/doxia/doxia-sitetools/trunk/

Author: vsiveton
Date: Mon Nov 30 12:53:09 2009
New Revision: 885405

URL: http://svn.apache.org/viewvc?rev=885405&view=rev
Log:
[maven-release-plugin] prepare release doxia-sitetools-1.1.2

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml?rev=885405&r1=885404&r2=885405&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml Mon Nov 30 12:53:09 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=885405&r1=885404&r2=885405&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Mon Nov 30 12:53:09 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=885405&r1=885404&r2=885405&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Mon Nov 30 12:53:09 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=885405&r1=885404&r2=885405&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Mon Nov 30 12:53:09 2009
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.doxia</groupId>
   <artifactId>doxia-sitetools</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
 
   <name>Doxia Sitetools</name>
@@ -98,9 +98,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2</url>
   </scm>
   <issueManagement>
     <system>jira</system>

Author: vsiveton
Date: Mon Nov 30 12:50:42 2009
New Revision: 885402

URL: http://svn.apache.org/viewvc?rev=885402&view=rev
Log:
o bump to doxia 1.1.2

Modified:
    maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=885402&r1=885401&r2=885402&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Mon Nov 30 12:50:42 2009
@@ -115,7 +115,7 @@
 
   <properties>
     <projectVersion>${project.version}</projectVersion>
-    <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
+    <doxiaVersion>1.1.2</doxiaVersion>
   </properties>
 
   <dependencyManagement>

Author: vsiveton
Date: Mon Nov 30 12:28:39 2009
New Revision: 885398

URL: http://svn.apache.org/viewvc?rev=885398&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
    maven/doxia/doxia/trunk/doxia-book/pom.xml
    maven/doxia/doxia/trunk/doxia-core/pom.xml
    maven/doxia/doxia/trunk/doxia-logging-api/pom.xml
    maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/pom.xml
    maven/doxia/doxia/trunk/doxia-sink-api/pom.xml
    maven/doxia/doxia/trunk/doxia-test-docs/pom.xml
    maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-book/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-book/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-logging-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-logging-api/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-logging-api/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-logging-api/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-decoration-model</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml Mon Nov 30 12:28:39
2009
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml Mon Nov 30 12:28:39
2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Mon Nov 30 12:28:39 2009
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-sink-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-sink-api/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-sink-api/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-test-docs/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-test-docs/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-test-docs/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-test-docs/pom.xml Mon Nov 30 12:28:39 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=885398&r1=885397&r2=885398&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Mon Nov 30 12:28:39 2009
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.doxia</groupId>
   <artifactId>doxia</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Doxia</name>
@@ -102,9 +102,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/tags/doxia-1.1.2</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/trunk</url>
   </scm>
   <issueManagement>
     <system>jira</system>

Author: vsiveton
Date: Mon Nov 30 12:28:27 2009
New Revision: 885397

URL: http://svn.apache.org/viewvc?rev=885397&view=rev
Log:
[maven-scm] copy for tag doxia-1.1.2

Added:
    maven/doxia/doxia/tags/doxia-1.1.2/
      - copied from r885396, maven/doxia/doxia/trunk/

Author: vsiveton
Date: Mon Nov 30 12:28:19 2009
New Revision: 885396

URL: http://svn.apache.org/viewvc?rev=885396&view=rev
Log:
[maven-release-plugin] prepare release doxia-1.1.2

Modified:
    maven/doxia/doxia/trunk/doxia-book/pom.xml
    maven/doxia/doxia/trunk/doxia-core/pom.xml
    maven/doxia/doxia/trunk/doxia-logging-api/pom.xml
    maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
    maven/doxia/doxia/trunk/doxia-modules/pom.xml
    maven/doxia/doxia/trunk/doxia-sink-api/pom.xml
    maven/doxia/doxia/trunk/doxia-test-docs/pom.xml
    maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-book/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-book/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-logging-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-logging-api/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-logging-api/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-logging-api/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-decoration-model</artifactId>
-      <version>${projectVersion}</version>
+      <version>1.1.2</version>
     </dependency>
 
     <dependency>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml Mon Nov 30 12:28:19
2009
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml Mon Nov 30 12:28:19
2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Mon Nov 30 12:28:19 2009
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-sink-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-sink-api/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-sink-api/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-test-docs/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-test-docs/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-test-docs/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-test-docs/pom.xml Mon Nov 30 12:28:19 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=885396&r1=885395&r2=885396&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Mon Nov 30 12:28:19 2009
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.doxia</groupId>
   <artifactId>doxia</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
 
   <name>Doxia</name>
@@ -102,9 +102,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/tags/doxia-1.1.2</url>
   </scm>
   <issueManagement>
     <system>jira</system>

Author: vsiveton
Date: Mon Nov 30 11:55:31 2009
New Revision: 885389

URL: http://svn.apache.org/viewvc?rev=885389&view=rev
Log:
o prepare release, bump parent and some plugins version

Modified:
    maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=885389&r1=885388&r2=885389&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Mon Nov 30 11:55:31 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>13</version>
+    <version>15</version>
     <relativePath>../../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -252,6 +252,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.6.1</version>
           <configuration>
             <source>1.4</source>
             <links>
@@ -290,7 +291,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
       </plugin>
     </plugins>
   </reporting>

Author: vsiveton
Date: Mon Nov 30 11:55:12 2009
New Revision: 885388

URL: http://svn.apache.org/viewvc?rev=885388&view=rev
Log:
o prepare release, bump parent and some plugins version

Modified:
    maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
    maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=885388&r1=885387&r2=885388&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Mon Nov 30 11:55:12 2009
@@ -121,12 +121,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.5.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>1.2</version>
+          <version>1.2.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -191,7 +191,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.5.1</version>
       </plugin>
     </plugins>
   </reporting>

Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=885388&r1=885387&r2=885388&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Mon Nov 30 11:55:12 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>13</version>
+    <version>15</version>
     <relativePath>../../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -287,7 +287,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>2.1.2</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -300,6 +300,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.6.1</version>
           <configuration>
             <source>1.4</source>
             <links>
@@ -349,7 +350,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2</version>
       </plugin>
     </plugins>
   </reporting>

Author: hboutemy
Date: Thu Nov 26 19:39:01 2009
New Revision: 884677

URL: http://svn.apache.org/viewvc?rev=884677&view=rev
Log:
[DOXIASITETOOLS-35] improved test text-only banners: works for empty string value

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=884677&r1=884676&r2=884677&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Thu Nov 26 19:39:01 2009
@@ -152,11 +152,11 @@
     {
         if ( banner != null )
         {
-            if ( banner.getHref() != null )
+            if ( StringUtils.isNotEmpty( banner.getHref() ) )
             {
                 banner.setHref( convertPath( banner.getHref(), urlContainer ) );
             }
-            if ( banner.getSrc() != null )
+            if ( StringUtils.isNotEmpty( banner.getSrc() ) )
             {
                 banner.setSrc( convertPath( banner.getSrc(), urlContainer ) );
             }

Author: hboutemy
Revision: 884302
Modified property: svn:log

Modified: svn:log at Wed Nov 25 22:46:53 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Nov 25 22:46:53 2009
@@ -1 +1 @@
-[MSITE-436] added lastModified attribute to DecorationModel (not persisted in XML) to track
last modification of site.xml
+[DOXIASITETOOLS-36] added lastModified attribute to DecorationModel (not persisted in XML)
to track last modification of site.xml

Author: hboutemy
Revision: 884312
Modified property: svn:log

Modified: svn:log at Wed Nov 25 22:46:19 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Nov 25 22:46:19 2009
@@ -1 +1 @@
-[MSITE-436] inherit parent lastModification value to child if parent is newer than child
+[DOXIASITETOOLS-36] inherit parent lastModification value to child if parent is newer than
child

Author: hboutemy
Date: Wed Nov 25 22:38:25 2009
New Revision: 884314

URL: http://svn.apache.org/viewvc?rev=884314&view=rev
Log:
[MSITE-436] use DecorationModel lastModification value to check if output file has to be generated

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=884314&r1=884313&r2=884314&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Wed Nov 25 22:38:25 2009
@@ -306,8 +306,8 @@
 
             File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName()
);
 
-            // TODO MSITE-436/MSITE-177: modified should be true when site.xml (current or
parent) is newer than outputFile
-            boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified()
);
+            boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified()
)
+                || ( siteRenderingContext.getDecoration().getLastModified() > outputFile.lastModified()
);
 
             if ( modified || docRenderer.isOverwrite() )
             {

Author: hboutemy
Date: Wed Nov 25 22:33:19 2009
New Revision: 884312

URL: http://svn.apache.org/viewvc?rev=884312&view=rev
Log:
[MSITE-436] inherit parent lastModification value to child if parent is newer than child

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=884312&r1=884311&r2=884312&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Wed Nov 25 22:33:19 2009
@@ -83,6 +83,11 @@
 
             child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(),
urlContainer ) );
 
+            if ( parent.getLastModified() > child.getLastModified() )
+            {
+                child.setLastModified( parent.getLastModified() );
+            }
+
             assembleBodyInheritance( name, child, parent, urlContainer );
 
             assembleCustomInheritance( child, parent );

Author: hboutemy
Date: Wed Nov 25 22:24:36 2009
New Revision: 884302

URL: http://svn.apache.org/viewvc?rev=884302&view=rev
Log:
[MSITE-436] added lastModified attribute to DecorationModel (not persisted in XML) to track
last modification of site.xml

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=884302&r1=884301&r2=884302&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Wed
Nov 25 22:24:36 2009
@@ -19,7 +19,7 @@
 under the License.
 -->
 
-<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
   xml.namespace="http://maven.apache.org/DECORATION/${version}"
   xml.schemaLocation="http://maven.apache.org/xsd/decoration-${version}.xsd">
   <id>decoration</id>
@@ -124,6 +124,12 @@
           <type>DOM</type>
           <identifier>true</identifier>
         </field>
+        <field xml.transient="true">
+          <name>lastModified</name>
+          <description>Timestamp of the last modification of this decoration model.</description>
+          <version>1.0.1+</version>
+          <type>long</type>
+        </field>
       </fields>
       <codeSegments>
         <codeSegment>

Author: hboutemy
Date: Wed Nov 25 21:44:43 2009
New Revision: 884285

URL: http://svn.apache.org/viewvc?rev=884285&view=rev
Log:
MSITE-436/MSITE-177: added a TODO to show where the code has to be improved

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=884285&r1=884284&r2=884285&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Wed Nov 25 21:44:43 2009
@@ -306,11 +306,8 @@
 
             File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName()
);
 
-            boolean modified = false;
-            if ( !outputFile.exists() || inputFile.lastModified() > outputFile.lastModified()
)
-            {
-                modified = true;
-            }
+            // TODO MSITE-436/MSITE-177: modified should be true when site.xml (current or
parent) is newer than outputFile
+            boolean modified = !outputFile.exists() || ( inputFile.lastModified() > outputFile.lastModified()
);
 
             if ( modified || docRenderer.isOverwrite() )
             {

Author: hboutemy
Date: Wed Nov 25 17:41:18 2009
New Revision: 884214

URL: http://svn.apache.org/viewvc?rev=884214&view=rev
Log:
fixed typos

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=884214&r1=884213&r2=884214&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Wed Nov 25 17:41:18 2009
@@ -137,7 +137,7 @@
     }
 
     /**
-     * Resolves all relative pathes between the elements in a banner. The banner element
might contain relative pathes
+     * Resolves all relative paths between the elements in a banner. The banner element might
contain relative paths
      * to the oldBaseUrl, these are changed to the newBannerUrl.
      *
      * @param banner

Author: hboutemy
Date: Wed Nov 25 17:17:06 2009
New Revision: 884200

URL: http://svn.apache.org/viewvc?rev=884200&view=rev
Log:
[DOXIASITETOOLS-35] fixed model interpolation for text-only banners (without src value)

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Wed Nov 25 17:17:06 2009
@@ -147,8 +147,14 @@
     {
         if ( banner != null )
         {
-            banner.setHref( convertPath( banner.getHref(), urlContainer ) );
-            banner.setSrc( convertPath( banner.getSrc(), urlContainer ) );
+            if ( banner.getHref() != null )
+            {
+                banner.setHref( convertPath( banner.getHref(), urlContainer ) );
+            }
+            if ( banner.getSrc() != null )
+            {
+                banner.setSrc( convertPath( banner.getSrc(), urlContainer ) );
+            }
         }
     }
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
Wed Nov 25 17:17:06 2009
@@ -25,7 +25,6 @@
   name="Child">
   <bannerLeft>
     <name>The Jakarta Project</name>
-    <src>http://jakarta.apache.org/images/jakarta-logo.gif</src>
     <href>http://jakarta.apache.org/</href>
   </bannerLeft>
   <bannerRight>

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
Wed Nov 25 17:17:06 2009
@@ -25,7 +25,6 @@
   name="Parent Name">
   <bannerLeft>
     <name>The Jakarta Project</name>
-    <src>http://jakarta.apache.org/images/jakarta-logo.gif</src>
     <href>http://jakarta.apache.org/</href>
   </bannerLeft>
   <bannerRight>

Author: olamy
Date: Tue Nov 17 00:02:05 2009
New Revision: 881062

URL: http://svn.apache.org/viewvc?rev=881062&view=rev
Log:
ignore ide file

Modified:
    maven/doxia/doxia/trunk/   (props changed)

Propchange: maven/doxia/doxia/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 17 00:02:05 2009
@@ -4,3 +4,4 @@
 *.iws
 .classpath
 .project
+.settings

Author: vsiveton
Date: Fri Sep 18 09:52:27 2009
New Revision: 816567

URL: http://svn.apache.org/viewvc?rev=816567&view=rev
Log:
o be sure to set the user agent

Modified:
    maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java

Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java?rev=816567&r1=816566&r2=816567&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/validation/OnlineHTTPLinkValidator.java
Fri Sep 18 09:52:27 2009
@@ -154,6 +154,7 @@
 
         // Some web servers don't allow the default user-agent sent by httpClient
         System.setProperty( HttpMethodParams.USER_AGENT, "Mozilla/4.0 (compatible; MSIE 6.0;
Windows NT 5.0)" );
+        this.cl.getParams().setParameter( HttpMethodParams.USER_AGENT, "Mozilla/4.0 (compatible;
MSIE 6.0; Windows NT 5.0)" );
 
         String link = lvi.getLink();
         try

Author: vsiveton
Date: Fri Sep 18 09:51:58 2009
New Revision: 816566

URL: http://svn.apache.org/viewvc?rev=816566&view=rev
Log:
o added log4j

Modified:
    maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
    maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/resources/log4j.properties

Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml?rev=816566&r1=816565&r2=816566&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml Fri Sep 18 09:51:58 2009
@@ -46,6 +46,12 @@
       <artifactId>commons-logging</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <!-- Not included in Httpclient -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
 
     <!-- Plexus -->
     <dependency>

Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/resources/log4j.properties?rev=816566&r1=816565&r2=816566&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/resources/log4j.properties (original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/resources/log4j.properties Fri
Sep 18 09:51:58 2009
@@ -19,6 +19,6 @@
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%c{1}:%L] %d{ISO8601} - %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%5p] %m%n
 
-log4j.logger.org.apache.commons.httpclient=ERROR
+log4j.logger.org.apache.commons.httpclient=INFO

Author: hboutemy
Date: Mon Sep 14 20:29:52 2009
New Revision: 814831

URL: http://svn.apache.org/viewvc?rev=814831&view=rev
Log:
fixed typos

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=814831&r1=814830&r2=814831&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Mon
Sep 14 20:29:52 2009
@@ -119,7 +119,7 @@
         </field>
         <field>
           <name>custom</name>
-          <description>Custom configuration for use with customised Velocity templates.</description>
+          <description>Custom configuration for use with customized Velocity templates.</description>
           <version>1.0.0+</version>
           <type>DOM</type>
           <identifier>true</identifier>
@@ -445,7 +445,7 @@
           <name>ref</name>
           <description><![CDATA[
             A reference to a pre-defined menu, such as a <code>reports</code>,
<code>modules</code>
-            or <code>parentProject</code>.
+            or <code>parent</code>.
           ]]></description>
           <version>1.0.0+</version>
           <type>String</type>

Author: ltheussl
Date: Tue Sep  8 08:57:35 2009
New Revision: 812399

URL: http://svn.apache.org/viewvc?rev=812399&view=rev
Log:
[DOXIA-367] Better error message

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=812399&r1=812398&r2=812399&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Tue Sep  8 08:57:35 2009
@@ -464,7 +464,8 @@
 
                                 if ( hash.endsWith( ".html" ) && !hash.startsWith(
"./" ) )
                                 {
-                                    String msg = "Ambiguous link: '" + hash + "'. If this
is a local link, prepend \"./\"!";
+                                    String msg = "Ambiguous link: '" + hash
+                                            + "'. If this is a local link, prepend \"./\"!";
                                     logMessage( "ambiguousLink", msg );
                                 }
 
@@ -2890,6 +2891,11 @@
             {
                 String[] param = StringUtils.split( params[i], "=" );
 
+                if ( param.length == 1 )
+                {
+                    throw new AptParseException( "Missing 'key=value' pair for macro parameter:
" + params[i] );
+                }
+
                 String key = unescapeForMacro( param[0] );
                 String value = unescapeForMacro( param[1] );
 

Author: ltheussl
Date: Mon Sep  7 13:54:48 2009
New Revision: 812141

URL: http://svn.apache.org/viewvc?rev=812141&view=rev
Log:
Add prime and double-prime to symbol fonts, they render correctly.

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java?rev=812141&r1=812140&r2=812141&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
Mon Sep  7 13:54:48 2009
@@ -1674,7 +1674,8 @@
                     Object key = names.nextElement();
                     Object value = att.getAttribute( key );
 
-                    ( (PrettyPrintXMLWriter) this.tableCaptionXMLWriterStack.getLast() ).addAttribute(
key.toString(), value.toString() );
+                    ( (PrettyPrintXMLWriter) this.tableCaptionXMLWriterStack.getLast() )
+                            .addAttribute( key.toString(), value.toString() );
                 }
             }
 
@@ -1704,14 +1705,17 @@
     private static final char DIAMS = 0x2666;
     private static final char EURO = 0x20ac;
     private static final char TRADE = 0x2122;
+    private static final char PRIME = 0x2032;
+    private static final char PPRIME = 0x2033;
 
     private static boolean needsSymbolFont( char c )
     {
         // greek characters and mathematical symbols, except the euro and trade symbols
         // symbols I couldn't get to display in any font:
-        // zwnj (0x200C), zwj (0x200D), lrm (0x200E), rlm (0x200F), oline (0x203E), prime
(0x2032),
-        // Prime (0x2033), lceil (0x2038), rceil (0x2039), lfloor (0x203A), rfloor (0x203B)
+        // zwnj (0x200C), zwj (0x200D), lrm (0x200E), rlm (0x200F), oline (0x203E),
+        // lceil (0x2038), rceil (0x2039), lfloor (0x203A), rfloor (0x203B)
         return ( c >= UPPER_ALPHA && c <= PIV )
+                || ( c == PRIME || c == PPRIME )
                 || ( c >= OLINE && c <= DIAMS && c != EURO &&
c != TRADE );
     }
 

Author: vsiveton
Date: Sun Sep  6 10:49:37 2009
New Revision: 811802

URL: http://svn.apache.org/viewvc?rev=811802&view=rev
Log:
o be sure that relative link is not outside the base (to prevent StringIndexOutOfBoundsException)
o added test case

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=811802&r1=811801&r2=811802&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Sun Sep  6 10:49:37 2009
@@ -518,6 +518,15 @@
                 base = base.substring( 0, base.lastIndexOf( "/" ) );
 
                 anchor = anchor.substring( 3 );
+
+                if ( base.lastIndexOf( "/" ) == -1 )
+                {
+                    while ( anchor.startsWith( "../" ) )
+                    {
+                        anchor = anchor.substring( 3 );
+                    }
+                    break;
+                }
             }
         }
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java?rev=811802&r1=811801&r2=811802&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
Sun Sep  6 10:49:37 2009
@@ -176,5 +176,29 @@
         assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/test\">"
) != -1 );
         assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/whatsnew-1.1\">"
) != -1 );
         assertTrue( result.indexOf( "<fo:block id=\"./whatsnew-1.1\">" ) != -1 );
+
+        writer = new StringWriter();
+        try
+        {
+            sink = new FoAggregateSink( writer );
+            sink.setDocumentName( "./subdir/dir/index.html" );
+            sink.link( "../../root.html" );
+            sink.text( "../../root.html" );
+            sink.link_();
+            sink.link( "../../../outside.html" );
+            sink.text( "../../../outside.html" );
+            sink.link_();
+            sink.body();
+            sink.body_();
+        }
+        finally
+        {
+            sink.close();
+        }
+
+        result = writer.toString();
+
+        assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./root\">"
) != -1 );
+        assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./outside\">"
) != -1 );
     }
 }

Author: vsiveton
Date: Sat Sep  5 15:14:27 2009
New Revision: 811663

URL: http://svn.apache.org/viewvc?rev=811663&view=rev
Log:
o using p-u:1.5.12 due to PLXUTILS-117

Modified:
    maven/doxia/doxia-tools/trunk/pom.xml

Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=811663&r1=811662&r2=811663&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Sat Sep  5 15:14:27 2009
@@ -123,7 +123,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.5.15</version>
+        <version>1.5.12</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Author: vsiveton
Date: Sat Sep  5 15:14:05 2009
New Revision: 811662

URL: http://svn.apache.org/viewvc?rev=811662&view=rev
Log:
o using p-u:1.5.12 due to PLXUTILS-117

Modified:
    maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=811662&r1=811661&r2=811662&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Sat Sep  5 15:14:05 2009
@@ -191,7 +191,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.5.15</version>
+        <version>1.5.12</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Author: vsiveton
Date: Sat Sep  5 15:13:06 2009
New Revision: 811661

URL: http://svn.apache.org/viewvc?rev=811661&view=rev
Log:
o using p-u:1.5.12 due to PLXUTILS-117

Modified:
    maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=811661&r1=811660&r2=811661&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Sat Sep  5 15:13:06 2009
@@ -229,7 +229,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.5.15</version>
+        <version>1.5.12</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Author: vsiveton
Date: Sat Sep  5 14:19:51 2009
New Revision: 811653

URL: http://svn.apache.org/viewvc?rev=811653&view=rev
Log:
DOXIASITETOOLS-33: Add an option to include or not the TOC

o option to add the TOC at the beginning or the end of the doc

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=811653&r1=811652&r2=811653&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
Sat Sep  5 14:19:51 2009
@@ -120,17 +120,32 @@
                 getLogger().debug( "Loaded pdf config file: " + fOConfigFile.getAbsolutePath()
);
             }
 
-            boolean addToc =
-                ( context != null && context.get( "includeTOC" ) != null ? ( (Boolean)
context.get( "includeTOC" ) )
-                                                                                        
                           .booleanValue()
-                                : true );
-            sink.setDocumentModel( documentModel, addToc );
+            String generateTOC =
+                ( context != null && context.get( "generateTOC" ) != null ? context.get(
"generateTOC" ).toString().trim()
+                                : "start" );
+            int tocPosition = 0;
+            if ( "start".equalsIgnoreCase( generateTOC ))
+            {
+                tocPosition = FoAggregateSink.TOC_START;
+            }
+            else if ( "end".equalsIgnoreCase( generateTOC ))
+            {
+                tocPosition = FoAggregateSink.TOC_END;
+            }
+            else
+            {
+                tocPosition = FoAggregateSink.TOC_NONE;
+            }
+            sink.setDocumentModel( documentModel, tocPosition );
 
             sink.beginDocument();
 
             sink.coverPage();
 
-            sink.toc();
+            if ( tocPosition == FoAggregateSink.TOC_START )
+            {
+                sink.toc();
+            }
 
             if ( ( documentModel.getToc() == null ) || ( documentModel.getToc().getItems()
== null ) )
             {
@@ -145,6 +160,11 @@
                 mergeSourcesFromTOC( documentModel.getToc(), sink, context );
             }
 
+            if ( tocPosition == FoAggregateSink.TOC_END )
+            {
+                sink.toc();
+            }
+
             sink.endDocument();
         }
         finally

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=811653&r1=811652&r2=811653&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
Sat Sep  5 14:19:51 2009
@@ -180,15 +180,14 @@
             iTextFiles = parseTOCFiles( outputDirectory, documentModel, context );
         }
 
-        boolean addToc =
-            ( context != null && context.get( "includeTOC" ) != null ? ( (Boolean)
context.get( "includeTOC" ) )
-                                                                                        
                       .booleanValue()
-                            : true );
+        String generateTOC =
+            ( context != null && context.get( "generateTOC" ) != null ? context.get(
"generateTOC" ).toString()
+                            : "start" );
 
         File iTextFile = new File( outputDirectory, outputName + ".xml" );
         File iTextOutput = new File( outputDirectory, outputName + "." + getOutputExtension()
);
         Document document = generateDocument( iTextFiles );
-        transform( documentModel, document, iTextFile, addToc );
+        transform( documentModel, document, iTextFile, generateTOC );
         generatePdf( iTextFile, iTextOutput );
     }
 
@@ -374,9 +373,10 @@
      * @param transformer the Transformer to set the parameters.
      * @param documentModel the DocumentModel to take the parameters from, could be null.
      * @param iTextFile the iTextFile not null for the relative paths.
-     * @param addToc to include or not the TOC.
+     * @param generateTOC not null, possible values are: 'none', 'start' and 'end'.
      */
-    private void addTransformerParameters( Transformer transformer, DocumentModel documentModel,
File iTextFile, boolean addToc )
+    private void addTransformerParameters( Transformer transformer, DocumentModel documentModel,
File iTextFile,
+                                           String generateTOC )
     {
         if ( documentModel == null )
         {
@@ -384,7 +384,7 @@
         }
 
         // TOC
-        addTransformerParameter( transformer, "toc.add", Boolean.toString( addToc ) );
+        addTransformerParameter( transformer, "toc.position", generateTOC );
 
         // Meta parameters
         boolean hasNullMeta = false;
@@ -491,15 +491,15 @@
      * @param documentModel the DocumentModel to take the parameters from, could be null.
      * @param document the Document to transform.
      * @param iTextFile the resulting iText xml file.
-     * @param addToc to include or not the TOC.
+     * @param generateTOC not null, possible values are: 'none', 'start' and 'end'.
      * @throws DocumentRendererException in case of a transformation error.
      */
-    private void transform( DocumentModel documentModel, Document document, File iTextFile,
boolean addToc )
+    private void transform( DocumentModel documentModel, Document document, File iTextFile,
String generateTOC )
         throws DocumentRendererException
     {
         Transformer transformer = initTransformer();
 
-        addTransformerParameters( transformer, documentModel, iTextFile, addToc );
+        addTransformerParameters( transformer, documentModel, iTextFile, generateTOC );
 
         // need a writer for StreamResult to prevent FileNotFoundException when iTextFile
contains spaces
         Writer writer = null;

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt?rev=811653&r1=811652&r2=811653&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
Sat Sep  5 14:19:51 2009
@@ -22,7 +22,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
     <!-- TOC Parameters -->
-    <xsl:param name="toc.add" />
+    <xsl:param name="toc.position" />
 
     <!-- MetaData Parameters -->
     <xsl:param name="meta.author" />
@@ -113,7 +113,7 @@
 
         <!-- Start TOC -->
         <xsl:choose>
-          <xsl:when test="$toc.add = 'true'">
+          <xsl:when test="$toc.position = 'start'">
             <newpage />
             <paragraph align="Center">
               <!-- TODO i18N -->
@@ -133,6 +133,25 @@
 
         <xsl:apply-templates select="*" mode="body" />
 
+        <!-- Start TOC -->
+        <xsl:choose>
+          <xsl:when test="$toc.position = 'end'">
+            <newpage />
+            <paragraph align="Center">
+              <!-- TODO i18N -->
+              <chunk font="Helvetica" size="24" fontstyle="bold" blue="0"
+                green="0" red="0">Table Of Contents</chunk>
+            </paragraph>
+            <paragraph align="Left" leading="24.0">
+              <newline />
+              <xsl:apply-templates select="*" mode="toc" />
+            </paragraph>
+          </xsl:when>
+          <xsl:otherwise>
+            <newpage />
+          </xsl:otherwise>
+        </xsl:choose>
+        <!-- End TOC -->
         </itext>
     </xsl:template>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=811653&r1=811652&r2=811653&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Sat Sep  5 14:19:51 2009
@@ -67,8 +67,30 @@
  * @version $Id$
  * @since 1.1
  */
-public class FoAggregateSink extends FoSink
+public class FoAggregateSink
+    extends FoSink
 {
+    /**
+     * No Table Of Content.
+     * @see #setDocumentModel(DocumentModel, int)
+     */
+    public static int TOC_NONE = 0;
+
+    /**
+     * Table Of Content at the start of the document.
+     * @see #setDocumentModel(DocumentModel, int)
+     */
+    public static int TOC_START = 1;
+
+    /**
+     * Table Of Content at the end of the document.
+     * @see #setDocumentModel(DocumentModel, int)
+     */
+    public static int TOC_END = 2;
+
+    // TODO: make configurable
+    private static final String COVER_HEADER_HEIGHT = "1.5in";
+
     /** The document model to be used by this sink. */
     private DocumentModel docModel;
 
@@ -84,15 +106,12 @@
     /** Content in head is ignored in aggregated documents. */
     private boolean ignoreText;
 
-    /** Flag to include of not the toc */
-    private boolean addToc;
+    /** Current position of the TOC, see {@link #TOC_POSITION} */
+    private int tocPosition;
 
     /** Used to get the current position in the TOC. */
     private final Stack tocStack = new Stack();
 
-    // TODO: make configurable
-    private static final String COVER_HEADER_HEIGHT = "1.5in";
-
     /**
      * Constructor.
      *
@@ -231,7 +250,6 @@
         }
     }
 
-
     /**
      * Sets the name of the current source document, relative to the source root.
      * Used to resolve links to other source documents.
@@ -246,36 +264,54 @@
     /**
      * Sets the DocumentModel to be used by this sink. The DocumentModel provides all the
meta-information
      * required to render a document, eg settings for the cover page, table of contents,
etc.
+     * <br/>
+     * By default, a TOC will be added at the beginning of the document.
      *
      * @param model the DocumentModel.
-     * @see #setDocumentModel(DocumentModel, boolean)
+     * @see #setDocumentModel(DocumentModel, String)
+     * @see #TOC_START
      */
     public void setDocumentModel( DocumentModel model )
     {
-        setDocumentModel( model, true );
+        setDocumentModel( model, TOC_START );
     }
 
     /**
      * Sets the DocumentModel to be used by this sink. The DocumentModel provides all the
meta-information
      * required to render a document, eg settings for the cover page, table of contents,
etc.
      *
-     * @param model the DocumentModel.
-     * @param addToc true to include the TOC in the sink.
+     * @param model the DocumentModel, could be null.
+     * @param tocPos should be one of these values: {@link #TOC_NONE}, {@link #TOC_START}
and {@link #TOC_END}.
      * @since 1.1.2
      */
-    public void setDocumentModel( DocumentModel model, boolean addToc )
+    public void setDocumentModel( DocumentModel model, int tocPos )
     {
         this.docModel = model;
-        this.addToc = addToc;
+        if ( !( tocPos == TOC_NONE || tocPos == TOC_START || tocPos == TOC_END ) )
+        {
+            if ( getLog().isDebugEnabled() )
+            {
+                getLog().debug( "Unrecognized value for tocPosition: " + tocPos + ", using
no toc." );
+            }
+            tocPos = TOC_NONE;
+        }
+        this.tocPosition = tocPos;
 
-        if ( this.addToc )
+        if ( this.docModel != null && this.docModel.getToc() != null && this.tocPosition
!= TOC_NONE )
         {
             DocumentTOCItem tocItem = new DocumentTOCItem();
             tocItem.setName( this.docModel.getToc().getName() );
             tocItem.setRef( "./toc" );
             List items = new LinkedList();
-            items.add( tocItem );
+            if ( this.tocPosition == TOC_START )
+            {
+                items.add( tocItem );
+            }
             items.addAll( this.docModel.getToc().getItems() );
+            if ( this.tocPosition == TOC_END )
+            {
+                items.add( tocItem );
+            }
 
             this.docModel.getToc().setItems( items );
         }
@@ -352,7 +388,7 @@
     }
 
     /** {@inheritDoc} */
-    public void anchor( String name, SinkEventAttributes attributes  )
+    public void anchor( String name, SinkEventAttributes attributes )
     {
         if ( name == null )
         {
@@ -380,13 +416,13 @@
     }
 
     /** {@inheritDoc} */
-    public void link( String name  )
+    public void link( String name )
     {
         link( name, null );
     }
 
     /** {@inheritDoc} */
-    public void link( String name, SinkEventAttributes attributes  )
+    public void link( String name, SinkEventAttributes attributes )
     {
         if ( name == null )
         {
@@ -458,7 +494,7 @@
                 return;
             }
 
-            anchor = chopExtension ( anchor );
+            anchor = chopExtension( anchor );
 
             String base = docName.substring( 0, docName.lastIndexOf( "/" ) );
             anchor = base + "/" + anchor;
@@ -488,7 +524,7 @@
         return base + "/" + anchor;
     }
 
-    private  String chopExtension( String name )
+    private String chopExtension( String name )
     {
         String anchor = name;
 
@@ -504,13 +540,14 @@
 
                 if ( dot2 != -1 )
                 {
-                    anchor = anchor.substring( 0, dot ) + "#"
-                        + HtmlTools.encodeId( anchor.substring( hash + 1, dot2 ) );
+                    anchor =
+                        anchor.substring( 0, dot ) + "#" + HtmlTools.encodeId( anchor.substring(
hash + 1, dot2 ) );
                 }
                 else
                 {
-                    anchor = anchor.substring( 0, dot ) + "#"
-                        + HtmlTools.encodeId( anchor.substring( hash + 1, anchor.length()
) );
+                    anchor =
+                        anchor.substring( 0, dot ) + "#"
+                            + HtmlTools.encodeId( anchor.substring( hash + 1, anchor.length()
) );
                 }
             }
             else
@@ -803,12 +840,8 @@
      */
     public void toc()
     {
-        if ( !this.addToc )
-        {
-            return;
-        }
-
-        if ( docModel == null || docModel.getToc() == null || docModel.getToc().getItems()
== null )
+        if ( docModel == null || docModel.getToc() == null || docModel.getToc().getItems()
== null
+            || this.tocPosition == TOC_NONE )
         {
             return;
         }
@@ -1107,7 +1140,6 @@
         writeSimpleTag( BLOCK_TAG );
         writeEndTag( TABLE_CELL_TAG );
 
-
         writeStartTag( TABLE_CELL_TAG, "number-columns-spanned", "2", "cover.border.left.bottom"
);
         writeStartTag( BLOCK_TAG, "cover.subtitle" );
         write( subtitle == null ? ( version == null ? "" : " v. " + version ) : subtitle
);
@@ -1140,7 +1172,7 @@
         writeEndTag( TABLE_ROW_TAG );
     }
 
-    private void writeCoverFooter( DocumentCover cover, DocumentMeta meta  )
+    private void writeCoverFooter( DocumentCover cover, DocumentMeta meta )
     {
         if ( cover == null && meta == null )
         {
@@ -1214,7 +1246,7 @@
 
         if ( atts == null )
         {
-            return new SinkEventAttributeSet( new String[] {SinkEventAttributes.HEIGHT, COVER_HEADER_HEIGHT}
);
+            return new SinkEventAttributeSet( new String[] { SinkEventAttributes.HEIGHT,
COVER_HEADER_HEIGHT } );
         }
 
         // FOP dpi: 72

Author: vsiveton
Date: Sat Sep  5 10:53:58 2009
New Revision: 811620

URL: http://svn.apache.org/viewvc?rev=811620&view=rev
Log:
o removed enforcer rule due to the fix of MPDF-31

Modified:
    maven/doxia/site/pom.xml

Modified: maven/doxia/site/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=811620&r1=811619&r2=811620&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Sat Sep  5 10:53:58 2009
@@ -242,28 +242,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- See MPDF-31 -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-java</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>(1.5]</version>
-                </requireJavaVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

Author: vsiveton
Date: Sat Sep  5 09:39:50 2009
New Revision: 811611

URL: http://svn.apache.org/viewvc?rev=811611&view=rev
Log:
o restored 1.4 compatibility

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=811611&r1=811610&r2=811611&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Sat Sep  5 09:39:50 2009
@@ -235,7 +235,7 @@
      */
     protected void setCellCount( int count )
     {
-        this.cellCountStack.addLast( Integer.valueOf( count ) );
+        this.cellCountStack.addLast( new Integer( count ) );
     }
 
     /**

Author: vsiveton
Date: Wed Sep  2 12:46:14 2009
New Revision: 810487

URL: http://svn.apache.org/viewvc?rev=810487&view=rev
Log:
o using latest doxia/pdf version
o added an enforcer rule due to MPDF-31

Modified:
    maven/doxia/site/pom.xml

Modified: maven/doxia/site/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=810487&r1=810486&r2=810487&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Wed Sep  2 12:46:14 2009
@@ -136,7 +136,7 @@
   </pluginRepositories>
 
   <properties>
-    <doxiaVersion>1.1.1</doxiaVersion>
+    <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
   </properties>
 
   <build>
@@ -155,7 +155,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pdf-plugin</artifactId>
-          <version>1.0</version>
+          <version>1.1-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -242,6 +242,28 @@
           </execution>
         </executions>
       </plugin>
+
+      <!-- See MPDF-31 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>pre-site</phase>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>(1.5]</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Author: vsiveton
Date: Wed Sep  2 12:44:56 2009
New Revision: 810486

URL: http://svn.apache.org/viewvc?rev=810486&view=rev
Log:
o using doxia-decoration-model:1.1.2-snap

Modified:
    maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=810486&r1=810485&r2=810486&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Wed Sep  2 12:44:56 2009
@@ -92,6 +92,11 @@
       <artifactId>doxia-module-xhtml</artifactId>
       <version>${projectVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -101,6 +106,12 @@
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-doxia-tools</artifactId>
       <version>1.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-decoration-model</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

Author: vsiveton
Date: Tue Sep  1 12:59:49 2009
New Revision: 810011

URL: http://svn.apache.org/viewvc?rev=810011&view=rev
Log:
DOXIASITETOOLS-33: Add an option to include or not the TOC

o using the context

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=810011&r1=810010&r2=810011&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
Tue Sep  1 12:59:49 2009
@@ -120,7 +120,11 @@
                 getLogger().debug( "Loaded pdf config file: " + fOConfigFile.getAbsolutePath()
);
             }
 
-            sink.setDocumentModel( documentModel  );
+            boolean addToc =
+                ( context != null && context.get( "includeTOC" ) != null ? ( (Boolean)
context.get( "includeTOC" ) )
+                                                                                        
                           .booleanValue()
+                                : true );
+            sink.setDocumentModel( documentModel, addToc );
 
             sink.beginDocument();
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=810011&r1=810010&r2=810011&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
Tue Sep  1 12:59:49 2009
@@ -180,10 +180,15 @@
             iTextFiles = parseTOCFiles( outputDirectory, documentModel, context );
         }
 
+        boolean addToc =
+            ( context != null && context.get( "includeTOC" ) != null ? ( (Boolean)
context.get( "includeTOC" ) )
+                                                                                        
                       .booleanValue()
+                            : true );
+
         File iTextFile = new File( outputDirectory, outputName + ".xml" );
         File iTextOutput = new File( outputDirectory, outputName + "." + getOutputExtension()
);
         Document document = generateDocument( iTextFiles );
-        transform( documentModel, document, iTextFile );
+        transform( documentModel, document, iTextFile, addToc );
         generatePdf( iTextFile, iTextOutput );
     }
 
@@ -369,14 +374,18 @@
      * @param transformer the Transformer to set the parameters.
      * @param documentModel the DocumentModel to take the parameters from, could be null.
      * @param iTextFile the iTextFile not null for the relative paths.
+     * @param addToc to include or not the TOC.
      */
-    private void addTransformerParameters( Transformer transformer, DocumentModel documentModel,
File iTextFile )
+    private void addTransformerParameters( Transformer transformer, DocumentModel documentModel,
File iTextFile, boolean addToc )
     {
         if ( documentModel == null )
         {
             return;
         }
 
+        // TOC
+        addTransformerParameter( transformer, "toc.add", Boolean.toString( addToc ) );
+
         // Meta parameters
         boolean hasNullMeta = false;
         if ( documentModel.getMeta() == null )
@@ -482,14 +491,15 @@
      * @param documentModel the DocumentModel to take the parameters from, could be null.
      * @param document the Document to transform.
      * @param iTextFile the resulting iText xml file.
+     * @param addToc to include or not the TOC.
      * @throws DocumentRendererException in case of a transformation error.
      */
-    private void transform( DocumentModel documentModel, Document document, File iTextFile
)
+    private void transform( DocumentModel documentModel, Document document, File iTextFile,
boolean addToc )
         throws DocumentRendererException
     {
         Transformer transformer = initTransformer();
 
-        addTransformerParameters( transformer, documentModel, iTextFile );
+        addTransformerParameters( transformer, documentModel, iTextFile, addToc );
 
         // need a writer for StreamResult to prevent FileNotFoundException when iTextFile
contains spaces
         Writer writer = null;

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt?rev=810011&r1=810010&r2=810011&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/resources/org/apache/maven/doxia/docrenderer/pdf/itext/TOC.xslt
Tue Sep  1 12:59:49 2009
@@ -21,6 +21,9 @@
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+    <!-- TOC Parameters -->
+    <xsl:param name="toc.add" />
+
     <!-- MetaData Parameters -->
     <xsl:param name="meta.author" />
     <xsl:param name="meta.creator" />
@@ -109,16 +112,23 @@
         <!-- End Front page -->
 
         <!-- Start TOC -->
-        <newpage />
-        <paragraph align="Center">
-          <!-- TODO i18N -->
-            <chunk font="Helvetica" size="24" fontstyle="bold" blue="0"
-                green="0" red="0">Table Of Contents</chunk>
-        </paragraph>
-        <paragraph align="Left" leading="24.0">
-            <newline />
-            <xsl:apply-templates select="*" mode="toc" />
-        </paragraph>
+        <xsl:choose>
+          <xsl:when test="$toc.add = 'true'">
+            <newpage />
+            <paragraph align="Center">
+              <!-- TODO i18N -->
+                <chunk font="Helvetica" size="24" fontstyle="bold" blue="0"
+                    green="0" red="0">Table Of Contents</chunk>
+            </paragraph>
+            <paragraph align="Left" leading="24.0">
+                <newline />
+                <xsl:apply-templates select="*" mode="toc" />
+            </paragraph>
+          </xsl:when>
+          <xsl:otherwise>
+            <newpage />
+          </xsl:otherwise>
+        </xsl:choose>
         <!-- End TOC -->
 
         <xsl:apply-templates select="*" mode="body" />

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=810011&r1=810010&r2=810011&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Tue Sep  1 12:59:49 2009
@@ -84,6 +84,9 @@
     /** Content in head is ignored in aggregated documents. */
     private boolean ignoreText;
 
+    /** Flag to include of not the toc */
+    private boolean addToc;
+
     /** Used to get the current position in the TOC. */
     private final Stack tocStack = new Stack();
 
@@ -245,19 +248,37 @@
      * required to render a document, eg settings for the cover page, table of contents,
etc.
      *
      * @param model the DocumentModel.
+     * @see #setDocumentModel(DocumentModel, boolean)
      */
     public void setDocumentModel( DocumentModel model )
     {
+        setDocumentModel( model, true );
+    }
+
+    /**
+     * Sets the DocumentModel to be used by this sink. The DocumentModel provides all the
meta-information
+     * required to render a document, eg settings for the cover page, table of contents,
etc.
+     *
+     * @param model the DocumentModel.
+     * @param addToc true to include the TOC in the sink.
+     * @since 1.1.2
+     */
+    public void setDocumentModel( DocumentModel model, boolean addToc )
+    {
         this.docModel = model;
+        this.addToc = addToc;
 
-        DocumentTOCItem tocItem = new DocumentTOCItem();
-        tocItem.setName( this.docModel.getToc().getName() );
-        tocItem.setRef( "./toc" );
-        List items = new LinkedList();
-        items.add( tocItem );
-        items.addAll( this.docModel.getToc().getItems() );
+        if ( this.addToc )
+        {
+            DocumentTOCItem tocItem = new DocumentTOCItem();
+            tocItem.setName( this.docModel.getToc().getName() );
+            tocItem.setRef( "./toc" );
+            List items = new LinkedList();
+            items.add( tocItem );
+            items.addAll( this.docModel.getToc().getItems() );
 
-        this.docModel.getToc().setItems( items );
+            this.docModel.getToc().setItems( items );
+        }
     }
 
     /**
@@ -782,6 +803,11 @@
      */
     public void toc()
     {
+        if ( !this.addToc )
+        {
+            return;
+        }
+
         if ( docModel == null || docModel.getToc() == null || docModel.getToc().getItems()
== null )
         {
             return;

Author: vsiveton
Date: Mon Aug 31 10:21:21 2009
New Revision: 809529

URL: http://svn.apache.org/viewvc?rev=809529&view=rev
Log:
o added TOC chapter in the TOC

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=809529&r1=809528&r2=809529&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Mon Aug 31 10:21:21 2009
@@ -25,6 +25,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -248,6 +249,15 @@
     public void setDocumentModel( DocumentModel model )
     {
         this.docModel = model;
+
+        DocumentTOCItem tocItem = new DocumentTOCItem();
+        tocItem.setName( this.docModel.getToc().getName() );
+        tocItem.setRef( "./toc" );
+        List items = new LinkedList();
+        items.add( tocItem );
+        items.addAll( this.docModel.getToc().getItems() );
+
+        this.docModel.getToc().setItems( items );
     }
 
     /**
@@ -783,6 +793,7 @@
         regionBefore( toc.getName() );
         regionAfter( getFooterText() );
         writeStartTag( FLOW_TAG, "flow-name", "xsl-region-body" );
+        writeStartTag( BLOCK_TAG, "id", "./toc" );
         chapterHeading( toc.getName(), false );
         writeln( "<fo:table table-layout=\"fixed\" width=\"100%\" >" );
         writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "0.45in" );
@@ -795,6 +806,7 @@
 
         writeEndTag( TABLE_BODY_TAG );
         writeEndTag( TABLE_TAG );
+        writeEndTag( BLOCK_TAG );
         writeEndTag( FLOW_TAG );
         writeEndTag( PAGE_SEQUENCE_TAG );
     }

Author: vsiveton
Date: Mon Aug 31 09:35:06 2009
New Revision: 809521

URL: http://svn.apache.org/viewvc?rev=809521&view=rev
Log:
o take care if extension already exists in velocity files 

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=809521&r1=809520&r2=809521&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
Mon Aug 31 09:35:06 2009
@@ -267,7 +267,14 @@
                 // Velocity file?
                 if ( !source.exists() )
                 {
-                    doc = href + "." + module.getExtension() + ".vm";
+                    if ( href.indexOf( "." + module.getExtension() ) != -1 )
+                    {
+                        doc = href + ".vm";
+                    }
+                    else
+                    {
+                        doc = href + "." + module.getExtension() + ".vm";
+                    }
                     source = new File( moduleBasedir, doc );
                 }
 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=809521&r1=809520&r2=809521&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
Mon Aug 31 09:35:06 2009
@@ -592,7 +592,14 @@
                     // Velocity file?
                     if ( !source.exists() )
                     {
-                        doc = href + "." + module.getExtension() + ".vm";
+                        if ( href.indexOf( "." + module.getExtension() ) != -1 )
+                        {
+                            doc = href + ".vm";
+                        }
+                        else
+                        {
+                            doc = href + "." + module.getExtension() + ".vm";
+                        }
                         source = new File( moduleBasedir, doc );
                     }
 

Author: vsiveton
Date: Mon Aug 31 09:33:52 2009
New Revision: 809520

URL: http://svn.apache.org/viewvc?rev=809520&view=rev
Log:
o added a debug log
o removed unused import

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java?rev=809520&r1=809519&r2=809520&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
Mon Aug 31 09:33:52 2009
@@ -623,6 +623,11 @@
     private Reader getVelocityReader( File f, String encoding, DocumentRendererContext context
)
         throws DocumentRendererException
     {
+        if ( getLogger().isDebugEnabled() )
+        {
+            getLogger().debug( "Velocity render for " + f.getAbsolutePath() );
+        }
+
         SiteResourceLoader.setResource( f.getAbsolutePath() );
 
         Context velocityContext = new VelocityContext();
@@ -638,7 +643,6 @@
         }
 
         StringWriter sw = new StringWriter();
-
         try
         {
             velocity.getEngine().mergeTemplate( f.getAbsolutePath(), encoding, velocityContext,
sw );

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java?rev=809520&r1=809519&r2=809520&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java
Mon Aug 31 09:33:52 2009
@@ -24,7 +24,6 @@
 import java.util.Map;
 
 import org.apache.maven.doxia.docrenderer.AbstractDocumentRenderer;
-import org.apache.maven.doxia.docrenderer.DocumentRendererContext;
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
 import org.apache.maven.doxia.document.DocumentModel;
 

Author: vsiveton
Date: Mon Aug 31 09:32:29 2009
New Revision: 809519

URL: http://svn.apache.org/viewvc?rev=809519&view=rev
Log:
DOXIA-364:  Guarantee the state of sinks and parsers impl

o added init() method from r807164

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=809519&r1=809518&r2=809519&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Mon Aug 31 09:32:29 2009
@@ -108,6 +108,8 @@
     /** {@inheritDoc} */
     public void head( SinkEventAttributes attributes )
     {
+        init();
+
         ignoreText = true;
     }
 
@@ -266,11 +268,6 @@
         String idName = name.replace( '\\', '/' );
 
         // prepend "./" and strip extension
-        while ( idName.indexOf( "//" ) != -1 )
-        {
-            idName = StringUtils.replace( idName, "//", "/" );
-        }
-
         if ( !idName.startsWith( "./" ) )
         {
             idName = "./" + idName;
@@ -281,6 +278,11 @@
             idName = idName.substring( 0, idName.lastIndexOf( "." ) );
         }
 
+        while ( idName.indexOf( "//" ) != -1 )
+        {
+            idName = StringUtils.replace( idName, "//", "/" );
+        }
+
         return idName;
     }