Author: ltheussl
Date: Thu Jul 19 04:22:36 2007
New Revision: 557577
URL: http://svn.apache.org/viewvc?view=rev&rev=557577
Log:
DOXIA-115: apt and xdoc modules require descriptor merge, otherwise macro tests
fail. Thanks to Eric Redmond.
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
(with props)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
(with props)
Removed:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/META-INF/
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
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?view=diff&rev=557577&r1=557576&r2=557577
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Thu Jul 19
04:22:36 2007
@@ -7,4 +7,27 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>doxia-module-apt</artifactId>
<name>Doxia :: APT Module</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+
<descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml?view=auto&rev=557577
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
Thu Jul 19 04:22:36 2007
@@ -0,0 +1,22 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>apt</role-hint>
+
<implementation>org.apache.maven.doxia.module.apt.AptParser</implementation>
+ <description></description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
+ <field-name>macroManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.site.module.SiteModule</role>
+ <role-hint>apt</role-hint>
+
<implementation>org.apache.maven.doxia.module.apt.AptSiteModule</implementation>
+ <description></description>
+ </component>
+ </components>
+</component-set>
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
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?view=diff&rev=557577&r1=557576&r2=557577
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Thu Jul 19
04:22:36 2007
@@ -7,4 +7,27 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>doxia-module-xdoc</artifactId>
<name>Doxia :: XDoc Module</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+
<descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml?view=auto&rev=557577
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
Thu Jul 19 04:22:36 2007
@@ -0,0 +1,22 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>xdoc</role-hint>
+
<implementation>org.apache.maven.doxia.module.xdoc.XdocParser</implementation>
+ <description>Parse an xdoc model and emit events into the specified
doxia Sink.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
+ <field-name>macroManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.site.module.SiteModule</role>
+ <role-hint>xdoc</role-hint>
+
<implementation>org.apache.maven.doxia.module.xdoc.XdocSiteModule</implementation>
+ <description></description>
+ </component>
+ </components>
+</component-set>
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
