You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2010/06/12 22:14:36 UTC
svn commit: r954133 - in /webservices/commons/trunk/modules/axiom: pom.xml
src/main/assembly/bin.xml src/site/site.xml
Author: veithen
Date: Sat Jun 12 20:14:35 2010
New Revision: 954133
URL: http://svn.apache.org/viewvc?rev=954133&view=rev
Log:
Include the Docbook generated documentation into the binary distribution (as PDF) and the site (as HTML). Also attach the PDFs so that they can be downloaded from Maven repositories.
Modified:
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
webservices/commons/trunk/modules/axiom/src/site/site.xml
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=954133&r1=954132&r2=954133&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sat Jun 12 20:14:35 2010
@@ -398,10 +398,6 @@
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.8</version>
@@ -454,14 +450,10 @@
<goals>
<goal>generate-pdf</goal>
</goals>
- <phase>pre-site</phase>
+ <phase>package</phase>
<configuration>
<includes>userguide.xml</includes>
<foCustomization>src/docbkx/xsl/fo.xsl</foCustomization>
- <postProcess>
- <copy file="target/docbkx/pdf/userguide.pdf"
- tofile="target/site/userguide.pdf"/>
- </postProcess>
</configuration>
</execution>
<execution>
@@ -469,14 +461,10 @@
<goals>
<goal>generate-pdf</goal>
</goals>
- <phase>pre-site</phase>
+ <phase>package</phase>
<configuration>
<includes>devguide.xml</includes>
<foCustomization>src/docbkx/xsl/fo.xsl</foCustomization>
- <postProcess>
- <copy file="target/docbkx/pdf/devguide.pdf"
- tofile="target/site/devguide.pdf"/>
- </postProcess>
</configuration>
</execution>
</executions>
@@ -499,6 +487,34 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-pdfs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/docbkx/pdf/userguide.pdf</file>
+ <type>pdf</type>
+ <classifier>userguide</classifier>
+ </artifact>
+ <artifact>
+ <file>${project.build.directory}/docbkx/pdf/devguide.pdf</file>
+ <type>pdf</type>
+ <classifier>devguide</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.6</version>
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml?rev=954133&r1=954132&r2=954133&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml Sat Jun 12 20:14:35 2010
@@ -35,10 +35,10 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/site</directory>
+ <directory>${project.build.directory}/docbkx/pdf</directory>
<outputDirectory>docs</outputDirectory>
<includes>
- <include>**/*</include>
+ <include>*.pdf</include>
</includes>
</fileSet>
<fileSet>
Modified: webservices/commons/trunk/modules/axiom/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/site.xml?rev=954133&r1=954132&r2=954133&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/site.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/site/site.xml Sat Jun 12 20:14:35 2010
@@ -43,9 +43,7 @@
</item>
<item name="Documentation">
<item name="User guide" href="userguide/userguide.html"/>
- <item name="User guide (PDF)" href="userguide.pdf"/>
<item name="Developer guide" href="devguide/devguide.html"/>
- <item name="Developer guide (PDF)" href="devguide.pdf"/>
<item name="Javadocs" href="/apidocs/index.html"/>
<item name="FAQ" href="faq.html"/>
<item name="View Source" href="http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/?root=Apache-SVN"/>