You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2008/12/18 03:35:18 UTC

svn commit: r727620 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/ide/ test/resources/projects/project-34/multymodule-1/ test/resources/projects/project-34/multymodule-1...

Author: baerrach
Date: Wed Dec 17 18:35:18 2008
New Revision: 727620

URL: http://svn.apache.org/viewvc?rev=727620&view=rev
Log:
[MECLIPSE-364] incorrect dependencies with different projectNameTemplates in submodules
EclipsePlugin
- Moved calculateProjectNameTemplate() to IdeUtils and parameterized.
- IdeUtils.calculateProjectNameTemplate() is now called once in setup to set the value of projectNameTemplate
  All previous uses of calculateProjectNameTemplate() now refer to getProjectNameTemplate()
- getProjectNameForArifact() now checks if the project is in the reactor and uses getProjectNameTemplateForMavenProject() to 
  use that project's name template definition and not the current project's definition
- getProjectNameTemplateForMavenProject() looks for the variables in the specified project pom and uses IdeUtils.calculateProjectNameTemplate() to return the project name template
AbstractIdeSupportMojo
- refactored isAvailableAsAReactorProject method body into getReactorProject which returns the project out of the reactor.
  isAvailableAsAReactorProject justs checks for against null from getReactorProject
- modified test project-34 to use projectNameTemplate
  the side effect of this is that the generated classpath for the web app MANIFEST.MF uses the eclipse project name for the jar.

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=727620&r1=727619&r2=727620&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 Wed Dec 17 18:35:18 2008
@@ -35,6 +35,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.model.Build;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -82,7 +83,7 @@
  * @execute phase="generate-resources"
  */
 public class EclipsePlugin
-    extends AbstractIdeSupportMojo
+extends AbstractIdeSupportMojo
 {
     private static final String WEAVE_DEPENDENCY = "weaveDependency";
 
@@ -757,6 +758,8 @@
         boolean ready = true;
 
         checkDeprecations();
+        setProjectNameTemplate( IdeUtils.calculateProjectNameTemplate( getProjectNameTemplate(), isAddVersionToProjectName(),
+                                                              isAddGroupIdToProjectName(), getLog() ) );
         ajdt = enableAjdt( executedProject ) && !ajdtVersion.equals( "none" );
         ready = validate();
 
@@ -1136,7 +1139,7 @@
 
         config.setWorkspaceConfiguration( getWorkspaceConfiguration() );
 
-        config.setProjectNameTemplate( calculateProjectNameTemplate() );
+        config.setProjectNameTemplate( getProjectNameTemplate() );
 
         String projectName = IdeUtils.getProjectName( config.getProjectNameTemplate(), project );
 
@@ -1700,40 +1703,7 @@
             }
         }
     }
-
-    /**
-     * Calculate the project name template from the fields {@link #projectNameTemplate},
-     * {@link #addVersionToProjectName} and {@link #addGroupIdToProjectName}
-     * 
-     * @return the project name template that should be used after considering the plugin configuration
-     */
-    private String calculateProjectNameTemplate()
-    {
-        if ( getProjectNameTemplate() != null )
-        {
-            if ( isAddVersionToProjectName() || isAddGroupIdToProjectName() )
-            {
-                getLog().warn(
-                               "projectNameTemplate definition overrides "
-                                   + "addVersionToProjectName or addGroupIdToProjectName" );
-            }
-            return getProjectNameTemplate();
-        }
-        else if ( isAddVersionToProjectName() && isAddGroupIdToProjectName() )
-        {
-            return IdeUtils.PROJECT_NAME_WITH_GROUP_AND_VERSION_TEMPLATE;
-        }
-        else if ( isAddVersionToProjectName() )
-        {
-            return IdeUtils.PROJECT_NAME_WITH_VERSION_TEMPLATE;
-        }
-        else if ( isAddGroupIdToProjectName() )
-        {
-            return IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE;
-        }
-        return IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE;
-    }
-
+    
     /**
      * {@inheritDoc}
      */
@@ -1753,7 +1723,45 @@
                 }
             }
         }
-        return IdeUtils.getProjectName( calculateProjectNameTemplate(), artifact );
+        MavenProject reactorProject = getReactorProject( artifact );
+        if ( reactorProject != null ) {
+            return IdeUtils.getProjectName( getProjectNameTemplateForMavenProject( reactorProject ), artifact );
+        }
+        return IdeUtils.getProjectName( getProjectNameTemplate(), artifact );
+    }
+    
+    /**
+     * @param mavenProject the project to get the projectNameTemplate configuration from
+     * @return the projectNameTemplate configuration from the specified MavenProject 
+     */
+    private String getProjectNameTemplateForMavenProject( MavenProject mavenProject )
+    {
+        String projectNameTemplate = null;
+        boolean addVersionToProjectName = false;
+        boolean addGroupIdToProjectName = false;
+
+        Build build = mavenProject.getBuild();
+        if ( build != null )
+        {
+            Plugin plugin = (Plugin) build.getPluginsAsMap().get( "org.apache.maven.plugins:maven-eclipse-plugin" );
+            if ( plugin != null )
+            {
+                Xpp3Dom config = (Xpp3Dom) plugin.getConfiguration();
+                if ( config != null )
+                {
+                    Xpp3Dom projectNameTemplateNode = config.getChild( "projectNameTemplate" );
+                    if ( projectNameTemplateNode != null )
+                    {
+                        projectNameTemplate = projectNameTemplateNode.getValue();
+                    }
+                    Xpp3Dom addVersionToProjectNameNode = config.getChild( "addVersionToProjectName" );
+                    addVersionToProjectName = addVersionToProjectNameNode != null;
+                    Xpp3Dom addGroupIdToProjectNameNode = config.getChild( "addGroupIdToProjectName" );
+                    addGroupIdToProjectName = addGroupIdToProjectNameNode != null;
+                }
+            }
+        }
+        return IdeUtils.calculateProjectNameTemplate(projectNameTemplate, addVersionToProjectName, addGroupIdToProjectName, getLog());
     }
 
     /**

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Wed Dec 17 18:35:18 2008
@@ -802,6 +802,16 @@
      */
     protected boolean isAvailableAsAReactorProject( Artifact artifact )
     {
+        return getReactorProject( artifact ) != null;
+    }
+    
+    /**
+     * Checks the list of reactor projects to see if the artifact is included.
+     * 
+     * @param artifact the artifact to check if it is in the reactor
+     * @return the reactor project or null if it is not in the reactor
+     */
+    protected MavenProject getReactorProject( Artifact artifact ) {
         if ( reactorProjects != null )
         {
             for ( Iterator iter = reactorProjects.iterator(); iter.hasNext(); )
@@ -813,7 +823,7 @@
                 {
                     if ( reactorProject.getVersion().equals( artifact.getVersion() ) )
                     {
-                        return true;
+                        return reactorProject;
                     }
                     else
                     {
@@ -825,8 +835,8 @@
                     }
                 }
             }
-        }
-        return false;
+        } 
+        return null;
     }
 
     /**

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Wed Dec 17 18:35:18 2008
@@ -314,6 +314,44 @@
     }
 
     /**
+     * Calculate the project name template from the specified value <code>projectNameTemplate</code>,
+     * <code>addVersionToProjectName</code> and <code>addGroupIdToProjectName</code>
+     * <p>
+     * Note: if projectNameTemplate is not null then that value will be used regardless of the values for
+     * addVersionToProjectName or addGroupIdToProjectName and a warning will be issued.
+     * 
+     * @param projectNameTemplate the current projectNameTemplate, if available
+     * @param addVersionToProjectName whether to include Version in the project name
+     * @param addGroupIdToProjectName whether to include GroupId in the project name.
+     * @return the project name template.
+     */
+    public static String calculateProjectNameTemplate( String projectNameTemplate, boolean addVersionToProjectName,
+                                                 boolean addGroupIdToProjectName, Log log )
+    {
+        if ( projectNameTemplate != null )
+        {
+            if ( addVersionToProjectName || addGroupIdToProjectName )
+            {
+                log.warn( "projectNameTemplate definition overrides "
+                    + "addVersionToProjectName or addGroupIdToProjectName" );
+            }
+            return projectNameTemplate;
+        }
+        else if ( addVersionToProjectName && addGroupIdToProjectName )
+        {
+            return IdeUtils.PROJECT_NAME_WITH_GROUP_AND_VERSION_TEMPLATE;
+        }
+        else if ( addVersionToProjectName )
+        {
+            return IdeUtils.PROJECT_NAME_WITH_VERSION_TEMPLATE;
+        }
+        else if ( addGroupIdToProjectName )
+        {
+            return IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE;
+        }
+        return IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE;
+    }    
+    /**
      * Use {@link IdeDependency#getEclipseProjectName()} instead.
      */
     protected static String getProjectName( String template, IdeDependency dep )

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project Wed Dec 17 18:35:18 2008
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>multymodule-1-1.0</name>
+  <name>prefix-multymodule-1-1.0</name>
   <comment/>
   <projects>
     <project>multymodule-4-1.0</project>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml Wed Dec 17 18:35:18 2008
@@ -49,4 +49,14 @@
       <systemPath>${basedir}/refproject-sysdep.jar</systemPath>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <projectNameTemplate>prefix-[artifactId]-[version]</projectNameTemplate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath Wed Dec 17 18:35:18 2008
@@ -24,7 +24,7 @@
   <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar"/>
   <classpathentry kind="lib" path="direct-sysdep.jar"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
-  <classpathentry kind="src" path="/multymodule-1-1.0"/>
+  <classpathentry kind="src" path="/prefix-multymodule-1-1.0"/>
   <classpathentry kind="src" path="/multymodule-4-1.0"/>
   <classpathentry kind="var" path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
     <attributes>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project Wed Dec 17 18:35:18 2008
@@ -2,7 +2,7 @@
   <name>multymodule-2-1.0</name>
   <comment/>
   <projects>
-    <project>multymodule-1-1.0</project>
+    <project>prefix-multymodule-1-1.0</project>
     <project>multymodule-4-1.0</project>
   </projects>
   <buildSpec>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF?rev=727620&r1=727619&r2=727620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF Wed Dec 17 18:35:18 2008
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Class-Path: deps-direct-compile-1.0.jar deps-refproject-compile-1.0.ja
- r direct-compile-1.0.jar direct-optional-1.0.jar direct-sysdep.jar mu
- ltymodule-1-1.0.jar multymodule-4-1.0.jar refproject-compile-1.0.jar 
- refproject-sysdep.jar
+ r direct-compile-1.0.jar direct-optional-1.0.jar direct-sysdep.jar pr
+ efix-multymodule-1-1.0.jar multymodule-4-1.0.jar refproject-compile-1
+ .0.jar refproject-sysdep.jar