Author: aheritier
Date: Sun Feb 12 05:32:29 2006
New Revision: 377174
URL: http://svn.apache.org/viewcvs?rev=377174&view=rev
Log:
Fix main site creation
Modified:
maven/maven-1/plugins-sandbox/trunk/plugins-parent/maven.xml
maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml
Modified: maven/maven-1/plugins-sandbox/trunk/plugins-parent/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugins-parent/maven.xml?rev=377174&r1=377173&r2=377174&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-parent/maven.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-parent/maven.xml Sun Feb 12
05:32:29 2006
@@ -42,20 +42,10 @@
<j:set var="executionDir" value="${basedir}" />
</j:if>
<maven:maven
- descriptor="${executionDir}/../project.xml"
+ descriptor="${executionDir}/../plugins-site/project.xml"
goals="confirm-and-deploy-site"
ignoreFailures="false"
/>
</postGoal>
-
- <goal name="confirm-and-deploy-site">
- <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"/>
- <attainGoal name="site:sshdeploy"/>
- </j:if>
- </j:if>
- </goal>
</project>
Modified: maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml?rev=377174&r1=377173&r2=377174&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml Sun Feb 12
05:32:29 2006
@@ -27,6 +27,15 @@
<attainGoal name="multiproject:site"/>
<attainGoal name="site:deploy"/>
</goal>
+ <goal name="confirm-and-deploy-site">
+ <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"/>
+ <attainGoal name="site:sshdeploy"/>
+ </j:if>
+ </j:if>
+ </goal>
<postGoal name="site">
<ant:move file="${maven.docs.dest}/projects-overview.html"
tofile="${maven.docs.dest}/index.html"/>
</postGoal>
