geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/maven-plugin plugin.jelly
Date Wed, 01 Sep 2004 16:37:29 GMT
djencks     2004/09/01 09:37:29

  Modified:    modules/maven-plugin plugin.jelly
  Log:
  plugin can now copy dependencies into the local geronimo repository when marked with 'repository'
  
  Revision  Changes    Path
  1.6       +28 -5     incubator-geronimo/modules/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/plugin.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- plugin.jelly	19 Aug 2004 00:22:23 -0000	1.5
  +++ plugin.jelly	1 Sep 2004 16:37:29 -0000	1.6
  @@ -53,16 +53,39 @@
               <j:if test="${geronimoVersion == null}">
                   <fail>Missing required attribute: geronimoVersion</fail>
               </j:if>
  -            <j:if test="${targetDir == null}">
  -                <j:set var="targetDir" value="target/geronimo"/>
  -                <!--fail>Missing required attribute: targetDir</fail-->
  -            </j:if>
               <j:if test="${geronimoName == null}">
                   <j:set var="geronimoName" value="geronimo"/>
  -                <!--fail>Missing required attribute: targetDir</fail-->
  +            </j:if>
  +            <j:if test="${targetDir == null}">
  +                <j:set var="targetDir" value="${basedir}/target/${geronimoName}"/>
               </j:if>
   
               <unjar src="${maven.repo.local}/${geronimoName}/jars/${geronimoName}-assembly-${geronimoVersion}.jar"
dest="${targetDir}"/>
  +
  +            <!--copy stuff for this project into new geronimo repository-->
  +            <ant:copy todir="${targetDir}/repository">
  +                <ant:fileset dir="${maven.repo.local}">
  +                    <j:forEach var="artifact" items="${pom.artifacts}">
  +                        <j:set var="dependency" value="${artifact.dependency}"/>
  +                        <j:if test="${dependency.getProperty('repository') == 'true'}">
  +                            <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
  +                        </j:if>
  +                    </j:forEach>
  +                </ant:fileset>
  +            </ant:copy>
  +            <!-- this version doesn't seem to work. Why not?-->
  +            <!--ant:copy todir="${targetDir}/repository">
  +                <mapper type="glob" from="${maven.repo.local}*" to="*"/>
  +                <ant:fileset dir="${maven.repo.local}">
  +                    <j:forEach var="artifact" items="${pom.artifacts}">
  +                        <j:set var="dependency" value="${artifact.dependency}"/>
  +                        <j:if test="${dependency.getProperty('repository') == 'true'}">
  +                            <ant:fileset include="${artifact.path}"/>
  +                        </j:if>
  +                    </j:forEach>
  +                </ant:fileset>
  +            </ant:copy-->
  +
           </define:tag>
   
       </define:taglib>
  
  
  

Mime
View raw message