You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by we...@apache.org on 2002/12/16 05:55:03 UTC

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

werken      2002/12/15 20:55:03

  Modified:    src/plugins-build/uberjar plugin.jelly
  Log:
  Tweaking properties.
  
  Revision  Changes    Path
  1.3       +6 -2      jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly	16 Dec 2002 01:02:31 -0000	1.2
  +++ plugin.jelly	16 Dec 2002 04:55:03 -0000	1.3
  @@ -30,9 +30,11 @@
       prereqs="java:jar, uberjar:init"
       description="Build an uberjar">
   
  +    <j:set var="uberconf" value="${maven.uberjar.conf}"/>
  +
       <!-- Create the classworlds conf if user hasn't specified one -->
       <j:choose> 
  -      <j:when test="${uberconf == null}">
  +      <j:when test="${empty(uberconf)}">
           <attainGoal name="uberjar:classworlds-conf"/>
         </j:when>
         <j:otherwise>
  @@ -86,7 +88,9 @@
       prereqs="uberjar:init"
       description="Generates a classworlds conf">
   
  -    <j:if test="${ubermain == null}">
  +    <j:set var="ubermain" value="${maven.uberjar.main}"/>
  +
  +    <j:if test="${empty(ubermain)}">
         <fail message="">
   
   The ubermain property has not been set.  This value should