avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/plugin project.xml
Date Fri, 23 Apr 2004 07:29:20 GMT
mcconnell    2004/04/23 00:29:20

  Modified:    activation maven.xml
               merlin   external.xml maven.xml
               merlin/plugin project.xml
  Log:
  Fixing loose ends in the dist build.
  
  Revision  Changes    Path
  1.2       +12 -0     avalon/activation/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/activation/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	22 Apr 2004 02:50:34 -0000	1.1
  +++ maven.xml	23 Apr 2004 07:29:19 -0000	1.2
  @@ -44,6 +44,18 @@
             <ant:arg value="${maven.build.dir}/jars/${path}"/>
           </ant:exec>
         </j:if>
  +      <util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
  +      <j:if test="${metaFile.exists()}">
  +        <checksum file="${metaFile}" fileext=".md5" />
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
  +            <ant:arg value="--yes"/>
  +            <ant:arg value="-b"/>
  +            <ant:arg value="${metaFile}"/>
  +          </ant:exec>
  +        </j:if>
  +      </j:if>
       </j:forEach>
     </goal>
   
  
  
  
  1.14      +14 -0     avalon/merlin/external.xml
  
  Index: external.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/external.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- external.xml	22 Apr 2004 00:15:05 -0000	1.13
  +++ external.xml	23 Apr 2004 07:29:19 -0000	1.14
  @@ -66,6 +66,20 @@
         <version>&avalon-activation-impl-version;</version>
       </dependency>
   
  +    <dependency>
  +      <groupId>&avalon-meta-id;</groupId>
  +      <artifactId>&avalon-meta-plugin-id;</artifactId>
  +      <version>&avalon-meta-plugin-version;</version>
  +      <type>plugin</type>
  +    </dependency>
  +
  +    <dependency>
  +      <groupId>&avalon-util-id;</groupId>
  +      <artifactId>&avalon-util-plugin-id;</artifactId>
  +      <version>&avalon-util-plugin-version;</version>
  +      <type>plugin</type>
  +    </dependency>
  +
     </dependencies>
   
   </project>
  
  
  
  1.77      +34 -3     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- maven.xml	23 Apr 2004 04:28:31 -0000	1.76
  +++ maven.xml	23 Apr 2004 07:29:19 -0000	1.77
  @@ -203,7 +203,13 @@
         <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"
  +          <j:if test="${dep.getType()=='jar'}">
  +            <j:set var="destination" value="system"/>
  +          </j:if>
  +          <j:if test="${dep.getType()=='plugin'}">
  +            <j:set var="destination" value="plugins"/>
  +          </j:if>
  +          <ant:copy todir="${maven.build.dir}/merlin/${destination}"
                 preserveLastModified="true">
               <ant:fileset dir="${maven.repo.local}">
                 <ant:include name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
  @@ -216,10 +222,35 @@
   
     <goal name="xplugin">
       <maven:reactor basedir="${basedir}"
  -      includes="plugin/plugin.xml"
  +      includes="plugin/project.xml"
         banner="Installing:"
  +      goals="plugin:install"
         ignoreFailures="false" 
  -      postProcessing="false" />
  +      postProcessing="true" />
  +    <j:forEach var="child" items="${reactorProjects}">
  +      <j:set var="dir" 
  +          value="${maven.build.dir}/merlin/plugins"/>
  +      <j:set var="path" 
  +          value="${dir}/${child.groupId}/plugins/${child.artifactId}-${child.currentVersion}.jar"/>
  +      <ant:copy todir="${dir}/${child.groupId}/plugins" 
  +             preserveLastModified="true">
  +        <ant:fileset dir="${child.file.parentFile}/target">
  +          <ant:include 
  +              name="${child.artifactId}-${child.currentVersion}.jar"/>
  +          <ant:include 
  +              name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
  +        </ant:fileset>
  +      </ant:copy>
  +      <checksum file="${path}" fileext=".md5" />
  +      <j:if test="${maven_gpg_exe != null}">
  +        <ant:exec executable="${maven_gpg_exe}">
  +          <ant:arg value="-a"/>
  +          <ant:arg value="--yes"/>
  +          <ant:arg value="-b"/>
  +          <ant:arg value="${path}"/>
  +        </ant:exec>
  +      </j:if>
  +    </j:forEach>
     </goal>
   
     <!--
  
  
  
  1.26      +36 -2     avalon/merlin/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/project.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- project.xml	22 Apr 2004 03:45:38 -0000	1.25
  +++ project.xml	23 Apr 2004 07:29:20 -0000	1.26
  @@ -23,7 +23,7 @@
   
     <extend>${basedir}/../project.xml</extend>
   
  -  <groupId>&merlin-plugin-id;</groupId>
  +  <groupId>&merlin-id;</groupId>
     <id>&merlin-plugin-id;</id>
     <currentVersion>&merlin-plugin-version;</currentVersion>
     
  @@ -33,7 +33,7 @@
     <shortDescription>Merlin Plugin for Maven</shortDescription>
     <package>org.apache.avalon.plugins.merlin</package>
     
  -  <url>http://avalon.apache.org/plugins/merlin/</url>
  +  <url>http://avalon.apache.org/merlin/</url>
     <siteDirectory>/www/avalon.apache.org/maven-plugins/merlin</siteDirectory>
   
     <dependencies>
  @@ -48,5 +48,39 @@
       </dependency>
   
     </dependencies>
  +
  +  <build>
  +    <sourceDirectory>src/java</sourceDirectory>
  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +
  +    <unitTest>
  +      <includes>
  +        <include>**/*Test.java</include>
  +      </includes>
  +    </unitTest>
  +
  +    <resources>
  +      <resource>
  +        <directory>..</directory>
  +        <targetPath>META-INF</targetPath>
  +        <includes>
  +          <include>LICENSE.txt</include>
  +        </includes>
  +      </resource>
  +      <resource>
  +        <directory>src/plugin-resources</directory>
  +        <targetPath>plugin-resources</targetPath>
  +      </resource>
  +      <resource>
  +        <directory>.</directory>
  +        <includes>
  +          <include>plugin.jelly</include>
  +          <include>plugin.properties</include>
  +          <include>project.properties</include>
  +        </includes>
  +      </resource>
  +    </resources>
  +  </build>
  +
   
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message