[Maven-plugins-cvs] cvs commit: maven-plugins/javaapp plugin.jelly

[<jo...@us...>]

joehni      04/11/18 01:29:27

  Modified:    javaapp  plugin.jelly
  Log:
  Eliminated deprecated code.
  
  Revision  Changes    Path
  1.8       +30 -30    maven-plugins/javaapp/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly	16 Nov 2004 18:22:17 -0000	1.7
  +++ plugin.jelly	18 Nov 2004 09:29:27 -0000	1.8
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
   
   <project xmlns:j="jelly:core" 
  -     xmlns:resources="resources"
        xmlns:artifact="artifact"
        xmlns:u="jelly:util" 
  +     xmlns:maven="jelly:maven" 
        xmlns:ant="jelly:ant">
     
     <!-- ================================================================== -->
  @@ -29,7 +29,7 @@
     <goal name="javaapp:prepare-filesystem"
       description="Create the needed directory structure">
       
  -    <mkdir dir="${maven.javaapp.app.dir}/lib"/>
  +    <ant:mkdir dir="${maven.javaapp.app.dir}/lib"/>
       
     </goal>
   
  @@ -88,36 +88,36 @@
           
       <!-- unzip all JARS -->
   
  -    <fileScanner var="jarFileList">
  -      <fileset dir="${maven.javaapp.app.dir}/lib">
  -        <patternset>
  -          <include name="*.jar"/>
  -        </patternset>
  -      </fileset>
  -    </fileScanner>
  +    <ant:fileScanner var="jarFileList">
  +      <ant:fileset dir="${maven.javaapp.app.dir}/lib">
  +        <ant:patternset>
  +          <ant:include name="*.jar"/>
  +        </ant:patternset>
  +      </ant:fileset>
  +    </ant:fileScanner>
     
       <j:forEach var="jarFile" items="${jarFileList.iterator()}">              
  -      <unzip src="${jarFile.toString()}" dest="${maven.javaapp.app.dir}"/>
  +      <ant:unzip src="${jarFile.toString()}" dest="${maven.javaapp.app.dir}"/>
       </j:forEach>
       
       <!-- delete artifacts of signed JARS in the META-INF directory -->
   
  -    <delete>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.DSA"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.SF"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.RSA"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.dsa"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.sf"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.rsa"/>
  -    </delete>    
  +    <ant:delete>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.DSA"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.SF"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.RSA"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.dsa"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.sf"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="*.rsa"/>
  +    </ant:delete>    
   
       <!-- delete other artifacts in our way -->
   
  -    <delete>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="LICENSE.txt"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="INDEX.LIST"/>
  -      <fileset dir="${maven.javaapp.app.dir}/META-INF" includes="MANIFEST.MF"/>
  -    </delete>    
  +    <ant:delete>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="LICENSE.txt"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="INDEX.LIST"/>
  +      <ant:fileset dir="${maven.javaapp.app.dir}/META-INF" includes="MANIFEST.MF"/>
  +    </ant:delete>    
   
       <!-- Copy class files from java:compile into working directory -->
       
  @@ -129,7 +129,7 @@
     
       <!-- delete the copied JARS -->
       
  -    <delete dir="${maven.javaapp.app.dir}/lib"/>
  +    <ant:delete dir="${maven.javaapp.app.dir}/lib"/>
             
       <!-- Build the JAR file -->
           
  @@ -203,18 +203,18 @@
       description="Runs the executable JAR with the given command line">
   
       <echo>Running ${maven.javaapp.final.name} with "${maven.javaapp.cmdline}"</echo>
  -    <java jar="${maven.javaapp.final.name}" fork="yes">
  +    <ant:java jar="${maven.javaapp.final.name}" fork="yes">
         <u:tokenize var="listOfProperties" delim=" ">${maven.javaapp.sysproperties}</u:tokenize>
         <!-- Don't know how to split the thing to use <sysproperty> instead -->
         <u:tokenize var="listOfJvmArgs" delim=" ">${maven.javaapp.jvmargs}</u:tokenize>
         <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
  -        <jvmarg value="${somejvmarg}"/>
  +        <j:jvmarg value="${somejvmarg}"/>
         </j:forEach>    
         <j:forEach var="someProperty" items="${listOfProperties}">
  -        <jvmarg value="${someProperty}"/>
  +        <j:jvmarg value="${someProperty}"/>
         </j:forEach>      
  -      <arg line="${maven.javaapp.cmdline}"/>
  -    </java>  
  +      <j:arg line="${maven.javaapp.cmdline}"/>
  +    </ant:java>  
   
     </goal>
     
  @@ -226,7 +226,7 @@
       description="Copy any resources that must be present in the deployed JAR file">
           
       <j:if test="${!pom.build.resources.isEmpty()}">
  -      <resources:copy 
  +      <maven:copyResources
           resources="${pom.build.resources}"
           todir="${maven.javaapp.app.dir}"
         />