Author: veithen
Date: Mon Dec 6 22:56:15 2010
New Revision: 1042835
URL: http://svn.apache.org/viewvc?rev=1042835&view=rev
Log:
Again include the architecture and user guides (which were moved to make it
possible to generate the Maven site) into the docs distribution. Also upgraded
the maven-assembly-plugin because 2.1 has an issue with file permissions in ZIP
files.
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1042835&r1=1042834&r2=1042835&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Mon Dec 6
22:56:15 2010
@@ -156,7 +156,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2-beta-5</version>
<executions>
<execution>
<id>distribution-package</id>
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml?rev=1042835&r1=1042834&r2=1042835&view=diff
==============================================================================
---
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml
(original)
+++
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml
Mon Dec 6 22:56:15 2010
@@ -26,8 +26,8 @@
<fileSets>
<fileSet>
- <directory>../../xdocs</directory>
- <outputDirectory>xdocs</outputDirectory>
+ <directory>../../src/site/resources/images</directory>
+ <outputDirectory>guides/images</outputDirectory>
<excludes>
<exclude>.svn/**</exclude>
</excludes>
@@ -49,5 +49,20 @@
</includes>
</fileSet>
</fileSets>
+ <files>
+ <!-- TODO: this is based on the misconception that XDoc is a subset of
XHTML
+ or vice-versa. This is not correct and leads to all kinds of
troubles.
+ However, for the moment we don't have any better solution. -->
+ <file>
+ <source>../../src/site/xdoc/architectureGuide.xml</source>
+ <outputDirectory>guides</outputDirectory>
+ <destName>architectureGuide.html</destName>
+ </file>
+ <file>
+ <source>../../src/site/xdoc/userGuide.xml</source>
+ <outputDirectory>guides</outputDirectory>
+ <destName>userGuide.html</destName>
+ </file>
+ </files>
</assembly>
