svn commit: r521191 - in /maven/doxia: doxia-sitetools/trunk/ doxia-sitetools/trunk/doxia-site-renderer/ doxia/trunk/doxia-modules/doxia-module-apt/ doxia/trunk/doxia-modules/doxia-module-fml/ doxia/t

2007-03-22 Thread evenisse
Author: evenisse
Date: Thu Mar 22 03:26:25 2007
New Revision: 521191

URL: http://svn.apache.org/viewvc?view=rev&rev=521191
Log:
o Fix fml module
o fml module to site renderer

Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/   (props changed)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/   (props changed)

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/   (props changed)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/   (props changed)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/   (props changed)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/   (props changed)

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?view=diff&rev=521191&r1=521190&r2=521191
==
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Thu Mar 22 
03:26:25 2007
@@ -81,6 +81,10 @@
 
 
   org.apache.maven.doxia
+  doxia-module-fml
+
+
+  org.apache.maven.doxia
   doxia-module-xdoc
 
 

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?view=diff&rev=521191&r1=521190&r2=521191
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Thu Mar 22 03:26:25 2007
@@ -114,6 +114,11 @@
   
   
 org.apache.maven.doxia
+doxia-module-fml
+${doxiaVersion}
+  
+  
+org.apache.maven.doxia
 doxia-module-xdoc
 ${doxiaVersion}
   

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java?view=diff&rev=521191&r1=521190&r2=521191
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
 Thu Mar 22 03:26:25 2007
@@ -24,7 +24,7 @@
 /**
  * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
  * @version $Id:FmlSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
- * @plexus.component  role-hint="fml"
+ * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="fml"
  */
 public class FmlSiteModule
 extends AbstractSiteModule

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target

Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 03:26:25 2007
@@ -0,0 +1 @@
+target




svn commit: r521194 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/ doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/modu

2007-03-22 Thread evenisse
Author: evenisse
Date: Thu Mar 22 03:32:07 2007
New Revision: 521194

URL: http://svn.apache.org/viewvc?view=rev&rev=521194
Log:
Fix plexus descriptor generation

Modified:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.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/AptSiteModule.java?view=diff&rev=521194&r1=521193&r2=521194
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
 Thu Mar 22 03:32:07 2007
@@ -24,8 +24,7 @@
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
  * @version $Id:AptSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
- * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule"
- * role-hint="apt"
+ * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="apt"
  */
 public class AptSiteModule
 extends AbstractSiteModule

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java?view=diff&rev=521194&r1=521193&r2=521194
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
 Thu Mar 22 03:32:07 2007
@@ -24,7 +24,7 @@
 /**
  * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
  * @version $Id:DocBookSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 
24 Nov 2005) brett $
- * @plexus.component role-hint="doc-book"
+ * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="doc-book"
  */
 public class DocBookSiteModule
 extends AbstractSiteModule

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java?view=diff&rev=521194&r1=521193&r2=521194
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
 Thu Mar 22 03:32:07 2007
@@ -24,8 +24,7 @@
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
  * @version $Id:XdocSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
- * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule"
- * role-hint="xdoc"
+ * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="xdoc"
  */
 public class XdocSiteModule
 extends AbstractSiteModule