Author: snicoll
Date: Sat Mar 17 06:33:06 2007
New Revision: 519310

URL: http://svn.apache.org/viewvc?view=rev&rev=519310
Log:
MWAR-79: fixed resources handling in the reactor.
Submitted by: Elliot Metsger
Reviewed by: Stephane Nicoll

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?view=diff&rev=519310&r1=519309&r2=519310
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 Sat Mar 17 06:33:06 2007
@@ -540,6 +540,9 @@
             for ( Iterator it = webResources.iterator(); it.hasNext(); )
             {
                 Resource resource = (Resource) it.next();
+                if ( !(new File(resource.getDirectory())).isAbsolute() ) {
+                    resource.setDirectory( project.getBasedir() + 
File.separator + resource.getDirectory() );
+                }
                 copyResources( resource, webappDirectory, filterProperties );
             }
         }


Reply via email to