You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/07 17:29:07 UTC
svn commit: r1078835 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/MSITE-159/ src/it/MSITE-159/src/ src/it/MSITE-159/src/site/
src/it/MSITE-159/src/site/apt/ src/it/MSITE-304/ src/it/MSITE-322/
src/it/MSITE-322/mymodule/ src/it/MSITE-32...
Author: ltheussl
Date: Mon Mar 7 16:29:04 2011
New Revision: 1078835
URL: http://svn.apache.org/viewvc?rev=1078835&view=rev
Log:
merge r1075995 r1076195 and other minor modifs from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/
- copied from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/invoker.properties
- copied, changed from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/pom.xml
- copied unchanged from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/src/
- copied from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/src/site/
- copied from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/src/site/apt/
- copied from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/src/site/apt/index.apt
- copied unchanged from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/src/site/site.xml
- copied unchanged from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh
- copied unchanged from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/invoker.properties
- copied, changed from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/pom.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/main/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/main/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/main/java/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/main/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/main/java/test/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/main/java/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/main/java/test/Test.java
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/main/java/test/Test.java
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/fr/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/fr/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/fr/xdoc/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/fr/xdoc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/fr/xdoc/index.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/fr/xdoc/index.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/resources/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/resources/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/resources/images/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/resources/images/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/site.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/site_fr.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/site_fr.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/xdoc/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/xdoc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/xdoc/contact.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/xdoc/contact.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/xdoc/fr/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/xdoc/fr/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/site/xdoc/index.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/site/xdoc/index.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/test/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/test/java/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/test/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/mymodule/src/test/resources/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/mymodule/src/test/resources/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/pom.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/fr/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/fr/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/fr/xdoc/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/fr/xdoc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/fr/xdoc/index.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/fr/xdoc/index.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/css/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/css/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/css/maven-base.css
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/css/maven-base.css
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/css/maven-theme.css
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/css/maven-theme.css
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/css/print.css
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/css/print.css
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/css/site.css
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/css/site.css
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/doc/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/doc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/resources/images/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/resources/images/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/site.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/site_fr.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/site_fr.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/xdoc/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/xdoc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/xdoc/fr/
- copied from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/xdoc/fr/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/src/site/xdoc/index.xml
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/src/site/xdoc/index.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh
- copied unchanged from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/invoker.properties
- copied, changed from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/parent/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/parent/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/parent/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/parent/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/aggregator/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/aggregator/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/src/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/src/site/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/src/site/apt/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/src/site/apt/index.apt
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/child_and_module/src/site/site.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/child_and_module/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/src/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/src/site/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/src/site/apt/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/src/site/apt/index.apt
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/inheriting_child/src/site/site.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/inheriting_child/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/invoker.properties
- copied, changed from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/src/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/src/site/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/src/site/apt/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/src/site/apt/index.apt
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/module/src/site/site.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/src/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/src/site/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/src/site/apt/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/src/site/apt/index.apt
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/parent/src/site/site.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/src/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/src/site/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/src/site/apt/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/src/site/apt/index.apt
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/sub_module/src/site/site.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/sub_module/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/invoker.properties
- copied, changed from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/maven-rocks-plugin/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/maven-rocks-plugin/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/maven-rocks-plugin/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/maven-rocks-plugin/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/plugins/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/plugins/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/plugins/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/plugins/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/plugins/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/plugins/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/
- copied from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom.xml
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/pom.xml
- copied, changed from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh
- copied unchanged from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/verify.bsh
Removed:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/goals.txt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/usage.apt
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 7 16:29:04 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/invoker.properties (from r1076195, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/invoker.properties)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/invoker.properties&r1=1076195&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/invoker.properties (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/invoker.properties Mon Mar 7 16:29:04 2011
@@ -1,2 +1 @@
-invoker.maven.version = 3.0-
invoker.goals.1 = clean site:site
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/invoker.properties?rev=1078835&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/invoker.properties (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/invoker.properties Mon Mar 7 16:29:04 2011
@@ -0,0 +1,2 @@
+invoker.goals.1 = clean
+invoker.goals.2 = site:site site:stage site:stage-deploy
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh Mon Mar 7 16:29:04 2011
@@ -39,16 +39,8 @@ try
}
String tmpDir = System.getProperty( "java.io.tmpdir" );
- String strippedTmpDir = tmpDir.replaceAll( "[\\:\\?\\*]", "" );
- File parentDirectory = new File ( stagingDirectory, "localhost/" + strippedTmpDir + "/www.example.com/parent" );
- if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
- {
- System.err.println( "Staging directory for parent '" + parentDirectory + "' is missing or not a directory." );
- return false;
- }
-
- File childDirectory = new File ( stagingDirectory, "localhost/" + strippedTmpDir + "/www.example.com/parent/MSITE-304-child" );
+ File childDirectory = new File ( stagingDirectory, "MSITE-304-child" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "Staging directory for child '" + childDirectory + "' is missing or not a directory." );
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/invoker.properties (from r1075995, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/invoker.properties)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/invoker.properties&r1=1075995&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/invoker.properties (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/invoker.properties Mon Mar 7 16:29:04 2011
@@ -1,3 +1,2 @@
-invoker.maven.version = 3.0-
invoker.goals.1 = clean
invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/invoker.properties (from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/invoker.properties)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/invoker.properties&r1=1075782&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/invoker.properties (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/invoker.properties Mon Mar 7 16:29:04 2011
@@ -1,3 +1,2 @@
-invoker.maven.version = 3.0-
invoker.goals.1 = clean
invoker.goals.2 = site:site site:stage-deploy
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/invoker.properties (from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/invoker.properties)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/invoker.properties&r1=1075782&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/invoker.properties (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/invoker.properties Mon Mar 7 16:29:04 2011
@@ -1,3 +1,2 @@
-invoker.maven.version = 3.0-
invoker.goals.1 = clean
invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/invoker.properties (from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/invoker.properties)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/invoker.properties&r1=1075782&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/invoker.properties (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/invoker.properties Mon Mar 7 16:29:04 2011
@@ -1,3 +1,2 @@
-invoker.maven.version = 3.0-
invoker.goals.1 = clean
invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/pom.xml (from r1075782, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom/pom.xml&r1=1075782&r2=1078835&rev=1078835&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/pom/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/pom/pom.xml Mon Mar 7 16:29:04 2011
@@ -18,4 +18,15 @@
</site>
</distributionManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Mon Mar 7 16:29:04 2011
@@ -24,10 +24,13 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
+import java.util.Locale;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Site;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
@@ -165,6 +168,7 @@ public abstract class AbstractDeployMojo
/**
* Specifies the target URL for the deploy.
+ * This should be the top-level URL, ie above modules and locale sub-directories.
*
* @return the url to deploy to. Not null.
*
@@ -174,6 +178,21 @@ public abstract class AbstractDeployMojo
throws MojoExecutionException;
/**
+ * Find the relative path between the distribution URLs of the top parent and the current project.
+ *
+ * @return a String starting with "/".
+ */
+ protected String getDeployModuleDirectory()
+ {
+ String relative = "/" + siteTool.getRelativePath( project.getDistributionManagement().getSite().getUrl(),
+ getTopLevelParent( project ).getDistributionManagement().getSite().getUrl() );
+
+ // SiteTool.getRelativePath() uses File.separatorChar,
+ // so we need to convert '\' to '/' in order for the URL to be valid for Windows users
+ return relative.replace( '\\', '/' );
+ }
+
+ /**
* Use wagon to deploy the generated site to a given repository.
*
* @param repository the repository to deply to.
@@ -197,9 +216,6 @@ public abstract class AbstractDeployMojo
+ "',\n Using credentials from server id '" + repository.getId() + "'" );
}
- // TODO: deploy to top level site? is it safe to assume that modules deploy to the same site?
- //Site topLevelSite = getSite( getTopLevelProject( reactorProjects ) );
-
deploy( inputDirectory, repository );
}
@@ -211,7 +227,7 @@ public abstract class AbstractDeployMojo
try
{
- configureWagon( wagon, repository, settings, container, getLog() );
+ configureWagon( wagon, repository.getId(), settings, container, getLog() );
}
catch ( WagonConfigurationException e )
{
@@ -222,7 +238,8 @@ public abstract class AbstractDeployMojo
{
final ProxyInfo proxyInfo = getProxy( repository, getLog(), mavenSession, settingsDecrypter );
- push( inputDirectory, repository, wagonManager, wagon, proxyInfo, getLog() );
+ push( inputDirectory, repository, wagonManager, wagon, proxyInfo,
+ siteTool.getAvailableLocales( locales ), getDeployModuleDirectory(), getLog() );
if ( chmod )
{
@@ -300,7 +317,8 @@ public abstract class AbstractDeployMojo
}
private static void push( final File inputDirectory, final Repository repository,
- final WagonManager manager, final Wagon wagon, final ProxyInfo proxyInfo,final Log log )
+ final WagonManager manager, final Wagon wagon, final ProxyInfo proxyInfo,
+ final List<Locale> localesList, final String relativeDir, final Log log )
throws MojoExecutionException
{
AuthenticationInfo authenticationInfo = manager.getAuthenticationInfo( repository.getId() );
@@ -329,7 +347,23 @@ public abstract class AbstractDeployMojo
log.debug( "connect without authenticationInfo and without proxyInfo" );
wagon.connect( repository );
}
- wagon.putDirectory( inputDirectory, "." );
+ // Default is first in the list
+ final String defaultLocale = localesList.get( 0 ).getLanguage();
+
+ for ( Locale locale : localesList )
+ {
+ if ( locale.getLanguage().equals( defaultLocale ) )
+ {
+ // TODO: this also uploads the non-default locales,
+ // is there a way to exlude directories in wagon?
+ wagon.putDirectory( inputDirectory, relativeDir );
+ }
+ else
+ {
+ wagon.putDirectory( new File( inputDirectory, locale.getLanguage() ),
+ locale.getLanguage() + relativeDir );
+ }
+ }
}
catch ( ResourceDoesNotExistException e )
{
@@ -527,8 +561,8 @@ public abstract class AbstractDeployMojo
* @param log
* @throws WagonConfigurationException
*/
- static void configureWagon( Wagon wagon, Repository repository, Settings settings, PlexusContainer container,
- Log log )
+ private static void configureWagon( Wagon wagon, String repositoryId, Settings settings, PlexusContainer container,
+ Log log )
throws WagonConfigurationException
{
log.debug( " configureWagon " );
@@ -539,7 +573,7 @@ public abstract class AbstractDeployMojo
Server server = (Server) settings.getServers().get( i );
log.debug( "configureWagon server " + server.getId() );
String id = server.getId();
- if ( id != null && id.equals( repository.getId() ) )
+ if ( id != null && id.equals( repositoryId ) )
{
if ( server.getConfiguration() != null )
{
@@ -555,13 +589,13 @@ public abstract class AbstractDeployMojo
}
catch ( final ComponentLookupException e )
{
- throw new WagonConfigurationException( repository.getId(), "Unable to lookup wagon configurator."
+ throw new WagonConfigurationException( repositoryId, "Unable to lookup wagon configurator."
+ " Wagon configuration cannot be applied.", e );
}
catch ( ComponentConfigurationException e )
{
- throw new WagonConfigurationException( repository.getId(), "Unable to apply wagon configuration.",
- e );
+ throw new WagonConfigurationException( repositoryId, "Unable to apply wagon configuration.",
+ e );
}
finally
{
@@ -612,4 +646,67 @@ public abstract class AbstractDeployMojo
return null;
}
+
+ /**
+ * Return the top level parent of the given project.
+ *
+ * @param project the MavenProject. May be null in which case null is returned.
+ *
+ * @return the upper-most parent MavenProject, or the original project if it has no parent.
+ */
+ protected static MavenProject getTopLevelParent( final MavenProject project )
+ {
+ if ( project == null )
+ {
+ return null;
+ }
+
+ MavenProject parent = project;
+
+ while ( parent.getParent() != null )
+ {
+ parent = parent.getParent();
+ }
+
+ return parent;
+ }
+
+ /**
+ * Extract the distributionManagment site from the given MavenProject.
+ *
+ * @param project the MavenProject. Not null.
+ *
+ * @return the project site. Not null.
+ * Also site.getUrl() and site.getId() are guaranteed to be not null.
+ *
+ * @throws MojoExecutionException if any of the site info is missing.
+ */
+ protected static Site getSite( final MavenProject project )
+ throws MojoExecutionException
+ {
+ final String name = project.getName() + " ("
+ + project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion() + ")";
+
+ final DistributionManagement distributionManagement = project.getDistributionManagement();
+
+ if ( distributionManagement == null )
+ {
+ throw new MojoExecutionException( "Missing distribution management in project " + name );
+ }
+
+ final Site site = distributionManagement.getSite();
+
+ if ( site == null )
+ {
+ throw new MojoExecutionException(
+ "Missing site information in the distribution management of the project " + name );
+ }
+
+ if ( site.getUrl() == null || site.getId() == null )
+ {
+ throw new MojoExecutionException( "Missing site data: specify url and id for project " + name );
+ }
+
+ return site;
+ }
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Mon Mar 7 16:29:04 2011
@@ -19,12 +19,25 @@ package org.apache.maven.plugins.site;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.Menu;
import org.apache.maven.doxia.site.decoration.MenuItem;
+import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
@@ -39,16 +52,6 @@ import org.apache.maven.reporting.exec.M
import org.apache.maven.reporting.exec.MavenReportExecutorRequest;
import org.apache.maven.reporting.exec.ReportPlugin;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
/**
* Base class for site rendering mojos.
@@ -80,6 +83,13 @@ public abstract class AbstractSiteRender
private Map<String, String> moduleExcludes;
/**
+ * The component for assembling inheritance.
+ *
+ * @component
+ */
+ private DecorationModelInheritanceAssembler assembler;
+
+ /**
* Remote repositories used for the project.
*
* @todo this is used for site descriptor resolution - it should relate to the actual project but for some reason they are not always filled in
@@ -166,6 +176,19 @@ public abstract class AbstractSiteRender
*/
private MavenReportExecutor mavenReportExecutor;
+ /**
+ * Make links in the site descriptor relative to the project URL.
+ * By default, any absolute links that appear in the site descriptor,
+ * e.g. banner hrefs, breadcrumbs, menu links, etc., will be made relative to project.url.
+ *
+ * Links will not be changed if this is set to false, or if the project has no URL defined.
+ *
+ * @parameter expression="${relativizeDecorationLinks}" default-value="true"
+ *
+ * @since 2.3
+ */
+ private boolean relativizeDecorationLinks;
+
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
@@ -208,7 +231,7 @@ public abstract class AbstractSiteRender
// Put any of the properties in directly into the Velocity context
attributes.putAll( project.getProperties() );
-
+
DecorationModel decorationModel;
try
{
@@ -221,6 +244,22 @@ public abstract class AbstractSiteRender
{
throw new MojoExecutionException( "SiteToolException: " + e.getMessage(), e );
}
+
+ if ( relativizeDecorationLinks )
+ {
+ final String url = project.getUrl();
+
+ if ( url == null )
+ {
+ getLog().warn( "No project URL defined - decoration links will not be relativized!" );
+ }
+ else
+ {
+ getLog().info( "Relativizing decoration links with respect to project URL: " + url );
+ assembler.resolvePaths( decorationModel, url );
+ }
+ }
+
if ( template != null )
{
if ( templateFile != null )
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Mon Mar 7 16:29:04 2011
@@ -19,10 +19,8 @@ package org.apache.maven.plugins.site;
* under the License.
*/
-import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Site;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
/**
* Deploys the generated site using <code>scp</code> or <code>file</code>
@@ -51,7 +49,7 @@ public class SiteDeployMojo
{
if ( site == null )
{
- site = getSite( project );
+ site = getSite( getTopLevelParent( project ) );
}
return site.getId();
@@ -63,35 +61,9 @@ public class SiteDeployMojo
{
if ( site == null )
{
- site = getSite( project );
+ site = getSite( getTopLevelParent( project ) );
}
return site.getUrl();
}
-
- private static Site getSite( final MavenProject project )
- throws MojoExecutionException
- {
- final DistributionManagement distributionManagement = project.getDistributionManagement();
-
- if ( distributionManagement == null )
- {
- throw new MojoExecutionException( "Missing distribution management information in the project." );
- }
-
- final Site site = distributionManagement.getSite();
-
- if ( site == null )
- {
- throw new MojoExecutionException(
- "Missing site information in the distribution management element in the project." );
- }
-
- if ( site.getUrl() == null || site.getId() == null )
- {
- throw new MojoExecutionException( "Missing site data for deploy: specify url and id!" );
- }
-
- return site;
- }
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Mon Mar 7 16:29:04 2011
@@ -19,10 +19,9 @@ package org.apache.maven.plugins.site;
* under the License.
*/
+
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import java.util.List;
/**
* Deploys the generated site to a staging or mock directory to the site URL
@@ -68,6 +67,7 @@ public class SiteStageDeployMojo
private static final String DEFAULT_STAGING_DIRECTORY = "staging";
+
@Override
protected String getDeployRepositoryID()
throws MojoExecutionException
@@ -79,7 +79,7 @@ public class SiteStageDeployMojo
protected String getDeployRepositoryURL()
throws MojoExecutionException
{
- stagingSiteURL = getStagingSiteURL( project, reactorProjects, stagingSiteURL );
+ stagingSiteURL = getStagingSiteURL( stagingSiteURL );
getLog().info( "Using this URL for stage deploy: " + stagingSiteURL );
@@ -89,64 +89,33 @@ public class SiteStageDeployMojo
/**
* Find the URL where staging will take place.
*
- * @param currentProject The currently executing project
- * @param reactorProjects The projects in the reactor
* @param usersStagingSiteURL The staging site URL as suggested by the user's configuration
+ *
* @return the site URL for staging
*/
- private String getStagingSiteURL( MavenProject currentProject, List<MavenProject> reactorProjects,
- String usersStagingSiteURL )
+ private String getStagingSiteURL( String usersStagingSiteURL )
+ throws MojoExecutionException
{
String topLevelURL = null;
- String relative = "";
- // If the user has specified a stagingSiteURL - use it
if ( usersStagingSiteURL != null )
{
- getLog().debug( "stagingSiteURL specified by the user." );
+ // the user has specified a stagingSiteURL - use it
+ getLog().debug( "stagingSiteURL specified by the user: " + usersStagingSiteURL );
topLevelURL = usersStagingSiteURL;
}
- getLog().debug( "stagingSiteURL NOT specified by the user." );
-
- // Find the top level project in the reactor
- MavenProject topLevelProject = getTopLevelProject( reactorProjects );
-
- // Take the distributionManagement site url from the top level project,
- // if there is one, otherwise take it from the current project
- if ( topLevelProject == null )
- {
- if ( topLevelURL == null )
- {
- // The user didn't specify a URL and there is no top level project in the reactor
- // Use current project
- getLog().debug( "No top level project found in the reactor, using the current project." );
- topLevelURL =
- currentProject.getDistributionManagement().getSite().getUrl() + "/" + DEFAULT_STAGING_DIRECTORY;
- }
- }
else
{
- // Find the relative path between the parent and child distribution URLs, if any
- relative = "/" + siteTool.getRelativePath( currentProject.getDistributionManagement().getSite().getUrl(),
- topLevelProject.getDistributionManagement().getSite().getUrl() );
- // SiteTool.getRelativePath() uses File.separatorChar, so we need to convert '\' to '/' in order for the URL
- // to be valid for Windows users
- relative = relative.replace( '\\', '/' );
-
- if ( topLevelURL == null )
- {
- // The user didn't specify a URL and there is a top level project in the reactor
- // Use the top level project
- getLog().debug( "Using the top level project found in the reactor." );
- topLevelURL =
- topLevelProject.getDistributionManagement().getSite().getUrl() + "/" + DEFAULT_STAGING_DIRECTORY;
- }
+ // The user didn't specify a URL, use the top level target dir
+ topLevelURL =
+ getSite( getTopLevelParent( project ) ).getUrl() + "/" + DEFAULT_STAGING_DIRECTORY;
+ getLog().debug( "stagingSiteURL NOT specified, using the top level project: " + topLevelURL );
}
// Return either
- // usersURL + relative(from parent, to child)
+ // usersURL
// or
- // topLevelProjectURL + staging + relative(from parent, to child)
- return topLevelURL + relative;
+ // topLevelProjectURL + "staging"
+ return topLevelURL;
}
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Mon Mar 7 16:29:04 2011
@@ -21,15 +21,7 @@ package org.apache.maven.plugins.site;
import java.io.File;
-import java.util.List;
-
-import org.apache.maven.model.Site;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.plugins.site.wagon.repository.Repository;
-
-import org.codehaus.plexus.util.StringUtils;
/**
* Generates a site in a local staging or mock directory based on the site URL
@@ -54,6 +46,7 @@ public class SiteStageMojo
* Staging directory location. This needs to be an absolute path, like
* <code>C:\stagingArea\myProject\</code> on Windows or
* <code>/stagingArea/myProject/</code> on Unix.
+ * If this is not specified, the site will be staged in ${project.build.directory}/staging.
*
* @parameter expression="${stagingDirectory}"
*/
@@ -70,27 +63,12 @@ public class SiteStageMojo
protected String getDeployRepositoryURL()
throws MojoExecutionException
{
- String structureProject;
-
- try
- {
- structureProject = getStructure( project, false );
- }
- catch ( MojoFailureException ex )
- {
- throw new MojoExecutionException( "Missing site information.", ex );
- }
-
- if ( structureProject == null )
- {
- throw new MojoExecutionException( "Missing site information." );
- }
+ final String stageDir = ( stagingDirectory == null ) ? null : stagingDirectory.getAbsolutePath();
+ final String outputDir = getStagingDirectory( stageDir );
- stagingDirectory = getStagingDirectory( project, reactorProjects, stagingDirectory );
- getLog().info( "Using this directory for staging: " + stagingDirectory );
-
- final File outputDirectory = new File( stagingDirectory, structureProject );
+ getLog().info( "Using this directory for staging: " + outputDir );
+ final File outputDirectory = new File( outputDir );
// Safety
if ( !outputDirectory.exists() )
{
@@ -103,86 +81,32 @@ public class SiteStageMojo
/**
* Find the directory where staging will take place.
*
- * @param currentProject The currently executing project
- * @param reactorProjects The projects in the reactor
* @param usersStagingDirectory The staging directory as suggested by the user's configuration
- * @return the directory for staging
- */
- private File getStagingDirectory( MavenProject currentProject, List<MavenProject> reactorProjects,
- File usersStagingDirectory )
- {
- // Check if the user has specified a stagingDirectory
- if ( usersStagingDirectory != null )
- {
- getLog().debug( "stagingDirectory specified by the user." );
- return usersStagingDirectory;
- }
- getLog().debug( "stagingDirectory NOT specified by the user." );
-
- return new File( getTopLevelBuildDirectory(), DEFAULT_STAGING_DIRECTORY );
- }
-
- /**
- * Generates the site structure using the project hiearchy (project and its modules) or using the
- * distributionManagement elements from the pom.xml.
*
- * @param project
- * @param ignoreMissingSiteUrl
- * @return the structure relative path
- * @throws MojoFailureException if any
+ * @return the directory for staging
*/
- private static String getStructure( MavenProject project, boolean ignoreMissingSiteUrl )
- throws MojoFailureException
+ private String getStagingDirectory( String usersStagingDirectory )
{
- if ( project.getDistributionManagement() == null )
- {
- String hierarchy = project.getArtifactId();
-
- MavenProject parent = project.getParent();
- while ( parent != null )
- {
- hierarchy = parent.getArtifactId() + "/" + hierarchy;
- parent = parent.getParent();
- }
-
- return hierarchy;
- }
-
- Site site = project.getDistributionManagement().getSite();
- if ( site == null )
- {
- if ( !ignoreMissingSiteUrl )
- {
- throw new MojoFailureException(
- "Missing site information in the distribution management element in the project: '"
- + project.getName() + "'." );
- }
+ String topLevelURL = null;
- return null;
- }
-
- if ( StringUtils.isEmpty( site.getUrl() ) )
- {
- if ( !ignoreMissingSiteUrl )
- {
- throw new MojoFailureException( "The URL in the site is missing in the project descriptor." );
- }
-
- return null;
- }
-
- Repository repository = new Repository( site.getId(), site.getUrl() );
- StringBuffer hierarchy = new StringBuffer( 1024 );
- hierarchy.append( repository.getHost() );
- if ( !StringUtils.isEmpty( repository.getBasedir() ) )
+ if ( usersStagingDirectory != null )
{
- if ( !repository.getBasedir().startsWith( "/" ) )
- {
- hierarchy.append( '/' );
- }
- hierarchy.append( repository.getBasedir() );
- }
-
- return hierarchy.toString().replaceAll( "[\\:\\?\\*]", "" );
+ // the user has specified a stagingDirectory - use it
+ getLog().debug( "stagingDirectory specified by the user: " + usersStagingDirectory );
+ topLevelURL = usersStagingDirectory;
+ }
+ else
+ {
+ // The user didn't specify a URL, use the top level target dir
+ topLevelURL =
+ getTopLevelBuildDirectory().getAbsolutePath() + "/" + DEFAULT_STAGING_DIRECTORY;
+ getLog().debug( "stagingDirectory NOT specified, using the top level project: " + topLevelURL );
+ }
+
+ // Return either
+ // usersURL
+ // or
+ // topLevelProjectURL + "staging"
+ return topLevelURL;
}
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/usage.apt?rev=1078835&r1=1078834&r2=1078835&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/usage.apt (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/usage.apt Mon Mar 7 16:29:04 2011
@@ -143,6 +143,9 @@ mvn site:stage -DstagingDirectory=C:\ful
{{{http://maven.apache.org/guides/mini/guide-deployment-security-settings.html}Guide to Deployment and Security Settings}}
for more information on this.
+ By default, the site will be stage-deployed to <<<${distributionManagement.site.url}/staging/>>>.
+ A different location can be chosen with the <<<stagingSiteURL>>> parameter as shown below:
+
+-----+
mvn site:stage-deploy -DstagingSiteURL=scp://www.mycompany.com/www/project/
+-----+
@@ -167,3 +170,6 @@ mvn site:run
The server will, by default, be started on <<<http://localhost:8080/>>>. See
{{{http://jetty.mortbay.org/}http://jetty.mortbay.org/}} for more information about
the Jetty server.
+
+ <<Note:>> Running a site only works for single-module sites.
+ To preview a multi-module site one should use <<<site:stage>>>.