You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/27 14:18:52 UTC

cvs commit: maven/src/plugins-build/ejb plugin.jelly

dion        2003/03/27 05:18:52

  Modified:    src/plugins-build/ejb plugin.jelly
  Log:
  Explicity use ant name space. In prep for removal of jeez etc
  
  Revision  Changes    Path
  1.4       +32 -31    maven/src/plugins-build/ejb/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ejb/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly	10 Feb 2003 04:01:09 -0000	1.3
  +++ plugin.jelly	27 Mar 2003 13:18:52 -0000	1.4
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   
   <project xmlns:j="jelly:core"
  +         xmlns:ant="jelly:ant"
            xmlns:license="license" 
            xmlns:util="jelly:util">
   
  @@ -28,9 +29,9 @@
     <!--==================================================================-->
     <goal name="ejb:ejb" prereqs="ejb:init" description="Build an ejb file">
   
  -    <echo>Building ejb ${maven.final.name}</echo>
  +    <ant:echo>Building ejb ${maven.final.name}</ant:echo>
   
  -    <available property="maven.ejb.manifest.available"
  +    <ant:available property="maven.ejb.manifest.available"
         file="${maven.ejb.manifest}"/>
   
       <j:forEach var="dep" items="${pom.dependencies}">
  @@ -41,47 +42,47 @@
   
       <!-- jar task used for now due to problems with ejb jar not including 
            files other than class files -->
  -    <jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
  +    <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
         
         <!-- include marked dependencies -->
         <j:forEach var="dep" items="${pom.dependencies}">
           <j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
  -          <fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
  -            <include name="${dep.artifact}"/>
  -          </fileset>
  +          <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
  +            <ant:include name="${dep.artifact}"/>
  +          </ant:fileset>
           </j:if>
         </j:forEach>
    
   
         <j:if test="${maven.ejb.manifest.available}">
  -        <setProperty name="manifest" value="${maven.ejb.manifest}" />
  +        <ant:setProperty name="manifest" value="${maven.ejb.manifest}" />
         </j:if>
   
         <j:set var="licenseFileName"><license:fileName/></j:set>
         <util:file name="${licenseFileName}" var="licenseFile"/>
  -      <metainf dir="${licenseFile.canonicalFile.parent}">
  -        <include name="${licenseFile.canonicalFile.name}"/>
  -      </metainf>
  -
  -      <manifest>
  -        <attribute name="Built-By" value="${user.name}"/>
  -        <attribute name="Created-By" value="Apache Jakarta Maven"/>
  -        <attribute name="Package" value="${pom.package}"/>
  -        <attribute name="Class-Path" value="${maven.ejb.classpath}"/>
  -        <section name="${pom.package}">
  -          <attribute name="Specification-Title" value="${pom.artifactId}"/>
  -          <attribute name="Specification-Version" value="${pom.currentVersion}"/>
  -          <attribute name="Specification-Vendor" value="${pom.organization.name}"/>
  -          <attribute name="Implementation-Title" value="${pom.package}"/>
  -          <attribute name="Implementation-Version" value="${pom.currentVersion}"/>
  -          <attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
  -        </section>
  -      </manifest>
  +      <ant:metainf dir="${licenseFile.canonicalFile.parent}">
  +        <ant:include name="${licenseFile.canonicalFile.name}"/>
  +      </ant:metainf>
  +
  +      <ant:manifest>
  +        <ant:attribute name="Built-By" value="${user.name}"/>
  +        <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
  +        <ant:attribute name="Package" value="${pom.package}"/>
  +        <ant:attribute name="Class-Path" value="${maven.ejb.classpath}"/>
  +        <ant:section name="${pom.package}">
  +          <ant:attribute name="Specification-Title" value="${pom.artifactId}"/>
  +          <ant:attribute name="Specification-Version" value="${pom.currentVersion}"/>
  +          <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
  +          <ant:attribute name="Implementation-Title" value="${pom.package}"/>
  +          <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
  +          <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
  +        </ant:section>
  +      </ant:manifest>
       
  -      <fileset dir="${maven.ejb.src}"/>
  -      <fileset dir="${maven.build.dest}"/>
  +      <ant:fileset dir="${maven.ejb.src}"/>
  +      <ant:fileset dir="${maven.build.dest}"/>
   
  -    </jar>
  +    </ant:jar>
   
     </goal>
   
  @@ -92,10 +93,10 @@
           prereqs="ejb:ejb"
           description="Install the ejb in the local repository">
   
  -    <property name="maven.ejb.install.dir"
  +    <ant:property name="maven.ejb.install.dir"
         value="${maven.repo.local}/${pom.artifactDirectory}/ejbs"/>
  -    <mkdir dir="${maven.ejb.install.dir}"/>
  -    <copy file="${maven.build.dir}/${maven.final.name}.jar"
  +    <ant:mkdir dir="${maven.ejb.install.dir}"/>
  +    <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
         tofile="${maven.ejb.install.dir}/${maven.final.name}.jar"/>
   
     </goal>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org