cvs commit: jakarta-turbine-2/extensions/maven-plugin/src/plugin plugin.jelly

[henning]

henning     2004/07/04 09:47:57

  Modified:    extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
                        plugin.jelly
  Log:
  Avoid NullPointerException when property is missing
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.22  +1 -1      
jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly,v
  retrieving revision 1.1.2.21
  retrieving revision 1.1.2.22
  diff -u -r1.1.2.21 -r1.1.2.22
  --- plugin.jelly      3 Jul 2004 15:20:01 -0000       1.1.2.21
  +++ plugin.jelly      4 Jul 2004 16:47:57 -0000       1.1.2.22
  @@ -380,7 +380,7 @@
       <mkdir dir="${turbine.target.dir}/templates" />
   
       <j:forEach var="dep" items="${pom.dependencies}">
  -      <j:if test="${dep.getProperty('war.bundle').equalsIgnoreCase('true')}">
  +      <j:if test="${dep.getProperty('war.bundle') != null &amp;&amp; 
dep.getProperty('war.bundle').equalsIgnoreCase('true')}">
           <copy todir="${turbine.target.dir}/WEB-INF/lib"
             
file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
         </j:if>  
  
  
  

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