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/01/04 12:15:13 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/jnlp plugin.jelly

dion        2003/01/04 03:15:12

  Modified:    src/plugins-build/jnlp plugin.jelly
  Log:
  change use of non-default namespace for root element
  
  Revision  Changes    Path
  1.2       +29 -31    jakarta-turbine-maven/src/plugins-build/jnlp/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jnlp/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly	21 Nov 2002 19:31:56 -0000	1.1
  +++ plugin.jelly	4 Jan 2003 11:15:12 -0000	1.2
  @@ -1,26 +1,24 @@
   <?xml version="1.0"?>
   
  -<jj:project xmlns:j="jelly:core"
  -            xmlns:jj="jelly:jeez"
  -            xmlns:jelxml="jelly:xml"
  -            xmlns:u="jelly:util" 
  -            xmlns="dummy">
  +<project xmlns:j="jelly:core"
  +         xmlns:u="jelly:util">
   
       <!-- ================================================================== -->
       <!-- Generate JNLP files and signs jars if necessary                    -->
       <!-- ================================================================== -->
  -    <jj:goal name="jnlp"
  +    <goal name="jnlp"
           description="Generate JNLP file and sign all jars"
           prereqs="jnlp:generate-jnlp"/>
   
  -    <jj:goal name="jnlp:generate-jnlp"
  +    <goal name="jnlp:generate-jnlp"
                description="Generate the .jnlp file and sign all jars"
                prereqs="java:jar">
   
  -        <jj:mkdir dir="${maven.jnlp.dir}"/>
  -        <jj:echo>Creating ${maven.jnlp.dir}/${pom.id}.jnlp ...</jj:echo>
  +        <mkdir dir="${maven.jnlp.dir}"/>
  +        <echo>Creating ${maven.jnlp.dir}/${pom.id}.jnlp ...</echo>
   
  -        <j:file name="${maven.jnlp.dir}/${pom.id}.jnlp" prettyPrint="true">
  +        <j:file name="${maven.jnlp.dir}/${pom.id}.jnlp" prettyPrint="true"
  +          xmlns="dummy">
               <jnlp spec="${maven.jnlp.spec}"
                     codebase="${maven.jnlp.http.codebase}"
                     href="${pom.id}.jnlp">
  @@ -111,13 +109,13 @@
               </jnlp>
           </j:file>
   
  -        <jj:available file="${maven.jnlp.signjar.store}" property="maven.jnlp.store.exists"/>
  +        <available file="${maven.jnlp.signjar.store}" property="maven.jnlp.store.exists"/>
           <j:if test="${maven.jnlp.store.exists}">
   
  -            <jj:echo>Found a store...signing jars</jj:echo>
  +            <echo>Found a store...signing jars</echo>
   
  -            <jj:echo>Signing jar files ...</jj:echo>
  -            <jj:signjar
  +            <echo>Signing jar files ...</echo>
  +            <signjar
                   jar="${maven.build.dir}/${maven.final.name}.jar"
                   signedjar="${maven.jnlp.dir}/${maven.final.name}.jar"
                   alias="${maven.jnlp.signjar.alias}"
  @@ -126,7 +124,7 @@
   
               <j:forEach var="lib" items="${pom.dependencies}">
                   <j:if test="${lib.getProperty('jnlp.jar')=='true'}">
  -                    <jj:signjar
  +                    <signjar
                           jar="${maven.repo.local}/${lib.getProjectId()}/jars/${lib.getArtifact()}"
                           signedjar="${maven.jnlp.dir}/${lib.getArtifact()}"
                           alias="${maven.jnlp.signjar.alias}"
  @@ -134,7 +132,7 @@
                           keystore="${maven.jnlp.signjar.store}"/>
                   </j:if>
                   <j:if test="${lib.getProperty('jnlp.native.jar')=='true'}">
  -                    <jj:signjar
  +                    <signjar
                           jar="${maven.repo.local}/${lib.getProjectId()}/jars/${lib.getArtifact()}"
                           signedjar="${maven.jnlp.dir}/${lib.getArtifact()}"
                           alias="${maven.jnlp.signjar.alias}"
  @@ -143,40 +141,40 @@
                   </j:if>
               </j:forEach>
           </j:if>
  -    </jj:goal>
  +    </goal>
       
       <!-- ================================================================== -->
       <!-- Generate keystore file for signing jar files                       -->
       <!-- ================================================================== -->
  -    <jj:goal name="jnlp:generate-keystore"
  +    <goal name="jnlp:generate-keystore"
                description="Generate a keystore file">
           
  -        <jj:delete file="${maven.jnlp.signjar.store}"/>
  -        <jj:genkey alias="${maven.jnlp.signjar.alias}"
  +        <delete file="${maven.jnlp.signjar.store}"/>
  +        <genkey alias="${maven.jnlp.signjar.alias}"
                      storepass="${maven.jnlp.signjar.storepass}"
                      keystore="${maven.jnlp.signjar.store}"
                      validity="${maven.jnlp.signjar.validity}" >
  -            <jj:dname>
  +            <dname>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.cn') != null}">
  -                    <jj:param name="CN" value="${maven.jnlp.signjar.dname.cn}" />
  +                    <param name="CN" value="${maven.jnlp.signjar.dname.cn}" />
                   </j:if>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.ou') != null}">
  -                    <jj:param name="OU" value="${maven.jnlp.signjar.dname.ou}" />
  +                    <param name="OU" value="${maven.jnlp.signjar.dname.ou}" />
                   </j:if>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.o') != null}">
  -                    <jj:param name="O" value="${maven.jnlp.signjar.dname.o}" />
  +                    <param name="O" value="${maven.jnlp.signjar.dname.o}" />
                   </j:if>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.l') != null}">
  -                    <jj:param name="L" value="${maven.jnlp.signjar.dname.l}" />
  +                    <param name="L" value="${maven.jnlp.signjar.dname.l}" />
                   </j:if>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.s') != null}">
  -                    <jj:param name="S" value="${maven.jnlp.signjar.dname.s}" />
  +                    <param name="S" value="${maven.jnlp.signjar.dname.s}" />
                   </j:if>
                   <j:if test="${context.getVariable('maven.jnlp.signjar.dname.c') != null}">
  -                    <jj:param name="C" value="${maven.jnlp.signjar.dname.c}" />
  +                    <param name="C" value="${maven.jnlp.signjar.dname.c}" />
                   </j:if>
  -            </jj:dname>
  -        </jj:genkey>
  -    </jj:goal>
  +            </dname>
  +        </genkey>
  +    </goal>
   
  -</jj:project>
  +</project>