geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/common project.xml
Date Sat, 16 Aug 2003 19:18:32 GMT
jdillon     2003/08/16 12:18:32

  Modified:    .        maven.xml
               modules/common project.xml
  Log:
   o initial support for module output aggregation
  
  Revision  Changes    Path
  1.18      +49 -1     incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- maven.xml	16 Aug 2003 17:15:11 -0000	1.17
  +++ maven.xml	16 Aug 2003 19:18:32 -0000	1.18
  @@ -33,6 +33,7 @@
           banner="Executing (${goals}):"
           ignoreFailures="false"
           goals="${goals}"
  +        postProcessing="true"
       />
     </goal>
     
  @@ -67,6 +68,53 @@
     <preGoal name="default">
       <attainGoal name="modules:default"/>
     </preGoal>
  +  
  +  
  +  <!-- ========================= -->
  +  <!-- Module Output Aggregation -->
  +  <!-- ========================= -->
  +  
  +  <goal name="modules:aggregate">
  +    <ant:echo>Aggregating modules...</ant:echo>
  +    
  +    <j:scope>
  +      <j:forEach var="module" items="${reactorProjects}">
  +        <ant:echo>Processing ${module.id}...</ant:echo>
  +        
  +        <!-- Get the modules root directory -->
  +        <j:set var="module.root" value="${module.file.parent}"/>
  +        
  +        <!--
  +           | Execute the aggregation hook.
  +           |
  +           | TODO: Should check if there is an aggregate hook for this module
  +           |       instead of using the catch hack.
  +         -->
  +        <j:set var="hook.name" value="modules:aggregate:${module.id}"/>
  +        <j:catch var="e">
  +          <attainGoal name="${hook.name}"/>
  +        </j:catch>
  +        <j:if test="${e != null}">
  +          <ant:echo level="warning">Failed to invoke aggregate hook: ${e}</ant:echo>
  +        </j:if>
  +        
  +        <!-- Process dependencies -->
  +        <j:forEach var="dependency" items="${module.dependencies}">
  +          <j:if test="${dependency.getProperty('runtime') == 'true'}">
  +            <!-- 
  +               | TODO: copy dependency artifact to lib/
  +               |       probably need to have specifiers for where this lib will go?
  +               |       or should this be put into a helper tag and called by the
  +               |       module aggregation hook
  +             -->
  +          </j:if>
  +        </j:forEach>
  +      </j:forEach>
  +    </j:scope>
  +  </goal>
  +  
  +  <goal name="modules:aggregate:geronimo:geronimo-common">
  +  </goal>
     
     
     <!-- =============================== -->
  
  
  
  1.5       +10 -1     incubator-geronimo/modules/common/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/common/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	16 Aug 2003 15:14:11 -0000	1.4
  +++ project.xml	16 Aug 2003 19:18:32 -0000	1.5
  @@ -33,12 +33,18 @@
         <id>commons-logging</id>
         <version>1.0.3</version>
         <url>http://jakarta.apache.org/commons/logging.html</url>
  +      <properties>
  +        <runtime>true</runtime>
  +      </properties>
       </dependency>
       
       <dependency>
         <id>log4j</id>
         <version>1.2.8</version>
         <url>http://jakarta.apache.org/log4j</url>
  +      <properties>
  +        <runtime>true</runtime>
  +      </properties>
       </dependency>
       
       <dependency>
  @@ -46,6 +52,9 @@
         <artifactId>mx4j-jmx</artifactId>
         <version>SNAPSHOT</version>
         <url>http://mx4j.sourceforge.net</url>
  +      <properties>
  +        <runtime>true</runtime>
  +      </properties>
       </dependency>
       
     </dependencies>
  
  
  

Mime
View raw message