svn commit: r720443 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java

[ri...@apache.org]

Author: rinku
Date: Tue Nov 25 00:48:22 2008
New Revision: 720443

URL: http://svn.apache.org/viewvc?rev=720443&view=rev
Log:
[MECLIPSE-111] Additional webResources are not added to the component list when using WTP projects generation
Submitted by: Steve Baker (based on original by Alexandre Poitras)

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java?rev=720443&r1=720442&r2=720443&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java Tue Nov 25 00:48:22 2008
@@ -34,6 +34,7 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
  * Creates a .settings folder for Eclipse WTP 1.x release and writes out the configuration under it.
@@ -153,6 +154,20 @@
                                  IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(),
                                                                      warSourceDirectory, false ) );
             writer.endElement();
+            
+            // add web resources over the top of the war source directory
+            Xpp3Dom[] webResources = IdeUtils.getPluginConfigurationDom( config.getProject(), JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
+                    new String[] { "webResources", "resource" } );
+            for ( int index = 0; index < webResources.length; index++ )
+            {
+                File webResourceDirectory = new File( webResources[index].getChild( "directory" ).getValue() );
+            	writer.startElement( ELT_WB_RESOURCE );
+                writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
+                writer.addAttribute( ATTR_SOURCE_PATH,
+                                     IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(),
+                                    		 webResourceDirectory, false ) );
+                writer.endElement();
+            }
 
             // @todo is this really needed?
             writer.startElement( ELT_PROPERTY );