You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/10/30 21:45:05 UTC

svn commit: r329636 - in /maven/components/trunk/maven-plugins/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java test/projects/project-5/project.xml

Author: fgiust
Date: Sun Oct 30 12:44:58 2005
New Revision: 329636

URL: http://svn.apache.org/viewcvs?rev=329636&view=rev
Log:
PR: MNG-1332
Submitted by: Brian Bonner
Reviewed by: fgiust

Dependent-Modules not showing up in .wtpmodules
fixed project/executed project in EclipsePlugin, fixed wrong pom for test project 5

Modified:
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
    maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=329636&r1=329635&r2=329636&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Sun Oct 30 12:44:58 2005
@@ -350,9 +350,9 @@
         new EclipseProjectWriter( getLog() ).write( projectBaseDir, outputDir, project, executedProject,
                                                     reactorArtifacts, projectnatures, buildcommands );
 
-        new EclipseSettingsWriter( getLog() ).write( projectBaseDir, outputDir, executedProject );
+        new EclipseSettingsWriter( getLog() ).write( projectBaseDir, outputDir, project );
 
-        new EclipseWtpmodulesWriter( getLog() ).write( outputDir, executedProject, reactorArtifacts, sourceDirs,
+        new EclipseWtpmodulesWriter( getLog() ).write( outputDir, project, reactorArtifacts, sourceDirs,
                                                        localRepository );
 
         getLog().info( Messages.getString( "EclipsePlugin.wrote", //$NON-NLS-1$

Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml?rev=329636&r1=329635&r2=329636&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml Sun Oct 30 12:44:58 2005
@@ -29,15 +29,21 @@
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
           <projectnatures>
-            org.eclipse.jdt.core.javanature, org.eclipse.wst.common.modulecore.ModuleCoreNature
+            <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
+            <java.lang.String>org.eclipse.wst.common.modulecore.ModuleCoreNature</java.lang.String>
           </projectnatures>
           <buildcommands>
-            org.eclipse.wst.common.modulecore.ComponentStructuralBuilder, org.eclipse.jdt.core.javabuilder,
-            org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver
+            <java.lang.String>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</java.lang.String>
+            <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+            <java.lang.String>
+              org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver
+            </java.lang.String>
           </buildcommands>
           <classpathContainers>
-            org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5,
-            org.eclipse.jst.j2ee.internal.web.container/wtptest
+            <java.lang.String>
+              org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5
+            </java.lang.String>
+            <java.lang.String>org.eclipse.jst.j2ee.internal.web.container/wtptest</java.lang.String>
           </classpathContainers>
         </configuration>
       </plugin>