svn commit: r366313 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

[fgiust]

Author: fgiust
Date: Thu Jan  5 14:16:09 2006
New Revision: 366313

URL: http://svn.apache.org/viewcvs?rev=366313&view=rev
Log:
fix wtp 1.0 builders

Modified:
    
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=366313&r1=366312&r2=366313&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
 Thu Jan  5 14:16:09 2006
@@ -418,15 +418,15 @@
     {
         projectnatures = new ArrayList();
 
-        projectnatures.add( NATURE_JEM_WORKBENCH_JAVA_EMF ); // WTP nature
-
-        projectnatures.add( NATURE_JDT_CORE_JAVA );
-
-        projectnatures.add( NATURE_WST_MODULE_CORE_NATURE ); // WTP nature
         if ( !"R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
         {
-            projectnatures.add( NATURE_WST_FACET_CORE_NATURE ); // WTP nature
+            projectnatures.add( NATURE_WST_FACET_CORE_NATURE ); // WTP 1.0 
nature
         }
+
+        projectnatures.add( NATURE_JDT_CORE_JAVA );
+        projectnatures.add( NATURE_WST_MODULE_CORE_NATURE ); // WTP 0.7/1.0 
nature
+        projectnatures.add( NATURE_JEM_WORKBENCH_JAVA_EMF ); // WTP 0.7/1.0 
nature
+
     }
 
     private void fillDefaultClasspathContainers( String packaging )
@@ -439,12 +439,19 @@
     {
         buildcommands = new ArrayList();
 
-        buildcommands.add( BUILDER_WST_COMPONENT_STRUCTURAL ); // WTP builder
+        if ( "R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
+        {
+            buildcommands.add( BUILDER_WST_COMPONENT_STRUCTURAL ); // WTP 0.7 
builder
+        }
 
         buildcommands.add( BUILDER_JDT_CORE_JAVA );
 
-        buildcommands.add( BUILDER_WST_VALIDATION ); // WTP builder
-        buildcommands.add( 
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ); // WTP builder
+        buildcommands.add( BUILDER_WST_VALIDATION ); // WTP 0.7/1.0 builder
+
+        if ( "R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
+        {
+            buildcommands.add( 
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ); // WTP 0.7 builder
+        }
     }
 
     private void downloadSourceArtifacts( Collection artifacts, Collection 
reactorArtifacts )