Return-Path: 
 <jetspeed-dev-return-22897-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 21596 invoked from network); 28 Jul 2005 16:04:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 28 Jul 2005 16:04:10 -0000
Received: (qmail 8373 invoked by uid 500); 28 Jul 2005 16:03:59 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 8343 invoked by uid 500); 28 Jul 2005 16:03:58 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 8210 invoked by uid 99); 28 Jul 2005 16:03:58 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2005 09:03:57 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 28 Jul 2005 09:03:49 -0700
Received: (qmail 21162 invoked by uid 65534); 28 Jul 2005 16:03:54 -0000
Message-ID: <20050728160354.21160.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r225808 - in /portals/jetspeed-2/trunk: maven.xml
 project.properties
Date: Thu, 28 Jul 2005 16:03:54 -0000
To: jetspeed-dev@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ate
Date: Thu Jul 28 09:03:44 2005
New Revision: 225808

URL: http://svn.apache.org/viewcvs?rev=225808&view=rev
Log:
A few corrections and improvements to the allSite goal

Modified:
    portals/jetspeed-2/trunk/maven.xml
    portals/jetspeed-2/trunk/project.properties

Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=225808&r1=225807&r2=225808&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Thu Jul 28 09:03:44 2005
@@ -96,35 +96,44 @@
     </goal>
 
     <goal name="allSite"
-          prereqs="multiproject:site-init" 
           description="Build the site for the master project and all subprojects">
 
       <!-- Modified version of multiproject:site goal not using the reactor to run the site goal for each subproject
            but exec it in a separate process.
            This way one doesn't need to allocated 900M+ JVM memory to get this working!
       -->
+      <maven:reactor
+        basedir="${basedir}"
+        banner="Gathering project list"
+        includes="${maven.multiproject.includes}"
+        excludes="${maven.multiproject.excludes}"
+        postProcessing="true"
+        collectOnly="true"
+        collectionVar="multiprojects"
+        ignoreFailures="${maven.multiproject.ignoreFailures}"
+      />
       
+      <j:set var="online" value="${maven.mode.online}"/>
+      <j:choose>
+        <j:when test="${online}">
+          <j:set var="cmdargs" value="${maven.multiproject.site.goals}"/>
+        </j:when>
+        <j:otherwise>
+          <j:set var="cmdargs" value="-o ${maven.multiproject.site.goals}"/>
+        </j:otherwise>
+      </j:choose>
+        
       <j:forEach var="reactorProject" items="${multiprojects}">
 
-        <j:set var="online" value="${maven.mode.online}"/>
-        <j:choose>
-          <j:when test="${online}">
-            <j:set var="cmdargs" value="site"/>
-          </j:when>
-          <j:otherwise>
-            <j:set var="cmdargs" value="-o site"/>
-          </j:otherwise>
-        </j:choose>
-        
         <!-- I don't know yet if this will work on Linux too ... -->
         <exec dir="${reactorProject.context.getVariable('basedir')}" vmlauncher="false" failonerror="true" executable="maven">
           <arg line="${cmdargs}"/>
         </exec>
       </j:forEach>        
-      
       <echo>Now building reactor projects: ${multiprojects}</echo>
     
       <!-- copy each project over into ${maven.docs.dest} -->
+      
       <j:forEach var="reactorProject" items="${multiprojects}">
         <j:set var="directory" value="${maven.docs.dest}/${maven.multiproject.aggregateDir}${reactorProject.artifactId}"/>
         <mkdir dir="${directory}"/>
@@ -138,6 +147,7 @@
       <attainGoal name="multiproject:create-nav"/>
       <attainGoal name="multiproject:create-overview-page"/>
       <attainGoal name="site" />            
+            
     </goal>
     
     <goal name="jetspeed2:jar:install">

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=225808&r1=225807&r2=225808&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu Jul 28 09:03:44 2005
@@ -77,11 +77,14 @@
 # Multiproject settings
 maven.multiproject.includes=*/project.xml,components/*/project.xml,applications/*/project.xml,taglibs/*/project.xml
 maven.multiproject.excludes=project.xml,applications/project.xml,cornerstone*/project.xml,portlet-api/project.xml,design-docs/project.xml,site/project.xml,taglibs/project.xml,maven-plugin/project.xml,portals-bridges/**
+# following are default values but needed here because our allSite goal doesn't know them from the plugin
+maven.multiproject.aggregateDir=multiproject/
+maven.multiproject.ignoreFailures=false
 
 jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,portal-webapp/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml
 jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/jsf-demo/**,applications/localeselector/**,applications/palm/**,applications/pam/**,applications/perl/**,applications/php/**,applications/rss/**,applications/security/**,applications/struts-demo/**,,applications/jpetstore/**site/project.xml,design-docs/project.xml
 
-maven.multiproject.site.goals=site,dashboard:report-single
+maven.multiproject.site.goals=site dashboard:report-single
 
 ## Dashboard plugin
 maven.dashboard.includes=${maven.multiproject.includes}



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org