Author: aheritier
Date: Mon Oct 31 14:37:43 2005
New Revision: 329922
URL: http://svn.apache.org/viewcvs?rev=329922&view=rev
Log:
do not use dot in inner script variables names (interpreted as a property...)
Modified:
maven/maven-1/plugins/trunk/maven.xml
Modified: maven/maven-1/plugins/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/maven.xml?rev=329922&r1=329921&r2=329922&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/maven.xml (original)
+++ maven/maven-1/plugins/trunk/maven.xml Mon Oct 31 14:37:43 2005
@@ -30,15 +30,14 @@
</goal>
<goal name="plugins:deploy-all-sites" description="Create and deploy the web
site for all plugins">
<!-- We don't want to have the question about to deploy the root site
after each plugin -->
- <ant:property name="skip.main.site" value="true"/>
- <ant:property name="goal" value="site:deploy"/>
+ <j:set var="skipQuestion" value="true" scope="parent"/>
+ <j:set var="goal" value="site:deploy"/>
<attainGoal name="multiproject:goal"/>
<attainGoal name="multiproject:site"/>
<attainGoal name="site:deploy"/>
</goal>
<goal name="confirm-and-deploy-site">
- <j:set var="skipQuestion" value="${skip.main.site}"/>
- <j:if test="${!empty(skipQuestion) and skipQuestion==true}">
+ <j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
<i:ask question="Would you like to regenerate and deploy the main
plugins site (y/n)?" answer="ok" default="y"/>
<j:if test="${ok == 'y'}">
<attainGoal name="multiproject:site"/>
