mcconnell    2004/02/10 10:11:47

  Modified:    merlin/kernel/impl project.xml
               merlin   maven.xml
  Added:       merlin   external.xml
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.25      +2 -1      avalon/merlin/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml       10 Feb 2004 16:31:16 -0000      1.24
  +++ project.xml       10 Feb 2004 18:11:47 -0000      1.25
  @@ -34,12 +34,13 @@
   
       <dependency>
         <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-api</artifactId>
  +      <artifactId>avalon-repository-main</artifactId>
         <version>1.3-SNAPSHOT</version>
         <properties>
           <avalon.classloader>api</avalon.classloader>
         </properties>
       </dependency>
  +
       <dependency>
         <groupId>avalon-repository</groupId>
         <artifactId>avalon-repository-spi</artifactId>
  
  
  
  1.49      +22 -0     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- maven.xml 10 Feb 2004 16:31:16 -0000      1.48
  +++ maven.xml 10 Feb 2004 18:11:47 -0000      1.49
  @@ -189,6 +189,28 @@
       </j:forEach>
     </goal>
   
  +  <goal name="avalon:build-externals" description="Build Externals.">
  +    <maven:reactor basedir="${basedir}"
  +      includes="external.xml"
  +      banner="Installing:"
  +      ignoreFailures="false" 
  +      postProcessing="true" />
  +
  +    <j:forEach var="child" items="${reactorProjects}">
  +      <echo>${child}</echo>
  +      <j:set var="deps" value="${child.dependencies}"/>
  +        <j:forEach var="dep" items="${deps}">
  +          
<echo>${maven.repo.local}/${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}</echo>
  +          <ant:copy todir="${maven.build.dir}/merlin/system"
  +              preserveLastModified="true">
  +            <ant:fileset dir="${maven.repo.local}">
  +              <ant:include 
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
  +              <ant:include 
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}.meta"/>
  +            </ant:fileset>
  +          </ant:copy>
  +        </j:forEach>
  +    </j:forEach>
  +  </goal>
   
     <!--
     ==============================================================================
  
  
  
  1.1                  avalon/merlin/external.xml
  
  Index: external.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
  
    <pomVersion>3</pomVersion>
    <groupId>merlin</groupId>
    <id>merlin-external</id>
    <name>Avalon Merlin External Artifacts</name>
    <currentVersion>3.3</currentVersion>
  
    <dependencies>
      <dependency>
        <groupId>avalon-repository</groupId>
        <artifactId>avalon-repository-impl</artifactId>
        <version>1.3-SNAPSHOT</version>
      </dependency>
      <dependency>
        <groupId>avalon-repository</groupId>
        <artifactId>avalon-repository-util</artifactId>
        <version>1.2</version>
      </dependency>
      <dependency>
        <groupId>avalon-logging</groupId>
        <artifactId>avalon-logkit-api</artifactId>
        <version>1.0-SNAPSHOT</version>
      </dependency>
      <dependency>
        <groupId>avalon-logging</groupId>
        <artifactId>avalon-logkit-impl</artifactId>
        <version>1.0-SNAPSHOT</version>
      </dependency>
    </dependencies>
  
  </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to