From 59527fb5c0bcd962f19fee76c88c21becc14aca7 Mon Sep 17 00:00:00 2001 From: dion Date: Mon, 21 Jul 2003 01:13:52 +0000 Subject: [PATCH] Apply fixes for MAVEN-584 and MAVEN-574. Thanks Rafal!! git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113668 13f79535-47bb-0310-9956-ffa450edef68 --- multiproject/plugin.jelly | 9 +++++++- multiproject/plugin.properties | 5 ++++- .../templates/navigation-aggregate.xml | 2 +- multiproject/xdocs/changes.xml | 4 ++++ multiproject/xdocs/properties.xml | 21 ++++++++++++++++--- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly index 45836f63..ef627f51 100644 --- a/multiproject/plugin.jelly +++ b/multiproject/plugin.jelly @@ -50,7 +50,7 @@ - + + Producing ${navType} navigation... diff --git a/multiproject/plugin.properties b/multiproject/plugin.properties index 86542383..cac2e006 100644 --- a/multiproject/plugin.properties +++ b/multiproject/plugin.properties @@ -13,4 +13,7 @@ maven.multiproject.ignoreFailures=false # Valid values are: "aggregate" or "independent". maven.multiproject.navigation=aggregate -maven.multiproject.type=jar \ No newline at end of file +maven.multiproject.type=jar + +# directory under target/docs where aggregated sites are copied to +maven.multiproject.aggregateDir=multiproject/ diff --git a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml index f41c7e45..db9a00b2 100644 --- a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml +++ b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml @@ -7,7 +7,7 @@ #foreach ($reactorProject in $reactorProjects) - + #end diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index b8e2ded3..c8fae27e 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -7,6 +7,10 @@ + + Made aggregation directory configurable, use artifactId instead of + name for creating site directories / URLs. + Updated multiproject:site to automate navigation generation for all projects diff --git a/multiproject/xdocs/properties.xml b/multiproject/xdocs/properties.xml index f6385ae1..7fb0d670 100644 --- a/multiproject/xdocs/properties.xml +++ b/multiproject/xdocs/properties.xml @@ -13,6 +13,21 @@ Optional? Description + + maven.multiproject.aggregateDir + Yes + +

+ This property tells the plugin where the aggreagate sites should be copied to. +

+

+ The value is "multiproject/" by default, but you can change it to "projects/" + or "modules/" if you like. Please notice the required trailing slash. + Another option is to set this property to an empty string, which will tell + the plugin to place the sites in the root directory of the aggregating site. +

+ + maven.multiproject.basedir Yes @@ -83,8 +98,8 @@

If the property is set to aggregate a navigation menu is generated with each - project's name linking to /multiproject/${project.name}/index.html. At the completion of - the multiproject:site goal, each project's generated site is copied into + project's name linking to /${maven.multiproject.aggregateDir}${project.name}/index.html. + At the completion of the multiproject:site goal, each project's generated site is copied into the appropriate directory. e.g. if WebProject1 and JarProject2 are the names of projects processed via multiproject:site, the project that is executing multiproject:site will have the generated sites from @@ -123,4 +138,4 @@ - \ No newline at end of file +