jvanzyl     2002/07/18 12:00:56

  Modified:    src/plugins-build/gump plugin.jelly project.xml
  Removed:     src/plugins-build/gump maven-to-gump.dvsl
  Log:
  o Making the gump generator use jelly instead of DVSL. everything is
    going the way of the object as the xml inheritence jelly'ization of
    the project.xml file require working with the object. Further explanations
    are coming. But this shouldn't affect anyone.
  
  Revision  Changes    Path
  1.3       +53 -20    jakarta-turbine-maven/src/plugins-build/gump/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/gump/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly      16 Jul 2002 22:00:37 -0000      1.2
  +++ plugin.jelly      18 Jul 2002 19:00:56 -0000      1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project xmlns:j="jelly:core">
  +<jj:project xmlns:j="jelly:core" xmlns:jj="jelly:jeez" xmlns="dummy">
   
     <!-- ================================================================== -->
     <!-- G U M P  D E S C R I P T O R                                       -->
  @@ -12,24 +12,57 @@
     <!-- for Gump will be correct. Distribution of responsibility.          -->
     <!-- ================================================================== -->
   
  -  <goal
  -    name="gump:generate-descriptor"
  -    description="Generate Gump descriptor from Maven descriptor">
  -
  -    <taskdef 
  -      name="dvsl" 
  -      classname="org.apache.tools.dvsl.DVSLTask">
  -    </taskdef>
  -
  -    <dvsl
  -      basedir="."
  -      destdir="./"
  -      extension=".xml"
  -      style="${plugin.dir}/maven-to-gump.dvsl"
  -      in="project.xml"
  -      out="gump.xml"
  -    />
  +  <jj:goal name="gump"
  +           description="Generate Gump descriptor from Maven descriptor"
  +           prereqs="gump:generate-descriptor"/>
  +
  +  <jj:goal name="gump:generate-descriptor"
  +           description="Generate Gump descriptor from Maven descriptor">
  +
  +    <j:file name="gump.xml">
  +    <j:whitespace>
  +<module name="${pom.id}">
  +
  +  <description>${pom.shortDescription}</description>
  +  <url href="${pom.url}"/>
  +  
  +  <cvs repository="${pom.gumpRepositoryId}"/>
  +  
  +  <!-- This is really the cvs module. We need to change this but -->
  +  <!-- I will leave this for now until everything works.         -->
  +  
  +  <project name="${pom.id}">
  +    
  +    <!-- Standard Maven target to produce Javadocs, source -->
  +    <!-- and binary distributions.                         -->
  +    <ant buildfile="build.xml" target="jar">
  +      <property name="maven.final.name" value="${pom.id}-@@DATE@@"/>
  +    </ant>
  +    
  +    <package>${pom.package}</package>
  +
  +    <!-- All Maven projects need Ant and Xerces to build. -->
  +    <depend project="jakarta-ant"/>
  +    <depend project="xml-xerces"/>
  +
  +    <j:forEach var="dep" items="${pom.dependencies}">
  +    <depend project="${dep.id}"/> 
  +    </j:forEach>
  +
  +    <work nested="target/classes"/>
  +    <home nested="target"/>
  +    <jar name="${pom.id}-@@DATE@@.jar"/>
  +    <javadoc nested="docs/apidocs"/>
  +
  +    <nag from="Maven Developers &lt;[EMAIL PROTECTED]&gt;"
  +         to="${pom.build.nagEmailAddress}"/>
       
  -  </goal>                                
  +  </project>
   
  -</project>
  +</module>
  +    </j:whitespace>
  +    </j:file>
  +  
  +  </jj:goal>
  +  
  +</jj:project>
  
  
  
  1.6       +0 -16     jakarta-turbine-maven/src/plugins-build/gump/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/gump/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml       17 Jul 2002 06:20:15 -0000      1.5
  +++ project.xml       18 Jul 2002 19:00:56 -0000      1.6
  @@ -61,22 +61,6 @@
         </metaEntries>
       </dependency>
     
  -    <dependency>
  -      <id>velocity</id>
  -      <version>1.3</version>
  -      <metaEntries>
  -        <metaEntry>classloader:root.maven</metaEntry>
  -      </metaEntries>
  -    </dependency>
  -
  -    <dependency>
  -      <id>velocity-dvsl</id>
  -      <version>SNAPSHOT</version>
  -      <metaEntries>
  -        <metaEntry>classloader:root</metaEntry>
  -      </metaEntries>
  -    </dependency>
  -
     </dependencies>
   
     <build>
  
  
  

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

Reply via email to