You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/04/06 16:03:46 UTC
[33/50] [abbrv] git commit: Updates how docs are assembled
Updates how docs are assembled
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/31b60c96
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/31b60c96
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/31b60c96
Branch: refs/heads/develop
Commit: 31b60c96ea68d68fe4217975b476187b008415c7
Parents: aaf5a30
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Apr 6 10:17:19 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Apr 6 10:17:19 2014 +0200
----------------------------------------------------------------------
assembly/src/main/assembly/all.xml | 12 ++++++------
assembly/src/main/assembly/docs.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/31b60c96/assembly/src/main/assembly/all.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 02d639b..acf9c98 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -101,19 +101,19 @@
<!-- Include the XWork Javadoc in the assembly -->
<fileSet>
- <directory>../xwork-core/target/site/apidocs</directory>
+ <directory>../xwork-core/target/apidocs</directory>
<outputDirectory>docs/xwork-apidocs</outputDirectory>
</fileSet>
- <!-- Include the website in the assembly -->
- <fileSet>
- <directory>../target/site</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
+ <!-- Include the Struts 2 core Javadoc in the assembly -->
<fileSet>
<directory>../core/target/site</directory>
<outputDirectory>docs/struts2-core</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../core/target/apidocs</directory>
+ <outputDirectory>docs/struts2-core-apidocs</outputDirectory>
+ </fileSet>
<!-- Include the Confluence docs in the assembly -->
<fileSet>
http://git-wip-us.apache.org/repos/asf/struts/blob/31b60c96/assembly/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 721c0ba..d5d2f7b 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -47,7 +47,7 @@
<!-- Include the Confluence docs in the assembly -->
<fileSet>
- <directory>target/cwiki/WW/docs</directory>
+ <directory>target/cwiki</directory>
<outputDirectory>docs/docs</outputDirectory>
</fileSet>