maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject svn commit: r574764 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven/plugin/eclipse/writers/wtp/ main/java/org/apache/maven/plug...
Date Wed, 12 Sep 2007 01:59:59 GMT
Author: brianf
Date: Tue Sep 11 18:59:55 2007
New Revision: 574764

URL: http://svn.apache.org/viewvc?rev=574764&view=rev
Log:
merged in patch from meclipse-213

Added:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.jar
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.jar
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.war
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.war
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.jar
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.jar
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/target/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/main/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/main/java/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/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
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/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/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/main/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/main/java/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/src/main/java/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/main/java/DummyClass.txt
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/src/main/java/DummyClass.txt
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/.project
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/application.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/application.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/.modulemaps
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/test-file.txt
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/test-file.txt
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/application/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/src/main/application/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/test-file.txt
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/test-file.txt
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.project
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/expected/.project
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/src/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/main/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/src/main/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/main/java/
      - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/src/main/java/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/main/java/DummyClass.txt
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-4/src/main/java/DummyClass.txt
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
      - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/pom.xml
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/eclipse/writers/EclipseWriterConfig.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.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/IdeDependency.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/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.wtpmodules

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=574764&r1=574763&r2=574764&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
Tue Sep 11 18:59:55 2007
@@ -31,14 +31,17 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.writers.EclipseClasspathWriter;
+import org.apache.maven.plugin.eclipse.writers.EclipseManifestWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseOSGiManifestWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseProjectWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseSettingsWriter;
 import org.apache.maven.plugin.eclipse.writers.EclipseWriterConfig;
+import org.apache.maven.plugin.eclipse.writers.wtp.EclipseWtpApplicationXMLWriter;
 import org.apache.maven.plugin.eclipse.writers.wtp.EclipseWtpComponent15Writer;
 import org.apache.maven.plugin.eclipse.writers.wtp.EclipseWtpComponentWriter;
 import org.apache.maven.plugin.eclipse.writers.wtp.EclipseWtpFacetsWriter;
@@ -354,6 +357,20 @@
      */
     private boolean isJavaProject;
 
+    /**
+     * Must the manifest files be written for java projects so that that the jee classpath
for wtp is correct.
+     * 
+     * @parameter expression="${eclipse.wtpmanifest}" default-value="false"
+     */
+    private boolean wtpmanifest;
+    
+    /**
+     * Must the application files be written for ear projects in a separate directory.
+     * 
+     * @parameter expression="${eclipse.wtpapplicationxml}" default-value="false"
+     */
+    private boolean wtpapplicationxml;
+    
     protected boolean isJavaProject()
     {
         return isJavaProject;
@@ -776,6 +793,10 @@
     {
         EclipseWriterConfig config = createEclipseWriterConfig( deps );
 
+        if (wtpmanifest && isJavaProject())
+        {
+            EclipseManifestWriter.addManifestResource(getLog(), config);
+        }
         // NOTE: This could change the config!
         writeExtraConfiguration( config );
 
@@ -803,7 +824,12 @@
         {
             new EclipseClasspathWriter().init( getLog(), config ).write();
         }
-
+        
+        if (wtpapplicationxml)
+        {
+            new EclipseWtpApplicationXMLWriter().init(getLog(), config).write();
+        }
+        
         if ( pde )
         {
             this.getLog().info( "The Maven Eclipse plugin runs in 'pde'-mode." );
@@ -862,6 +888,8 @@
         String projectName = IdeUtils.getProjectName( config.getProjectNameTemplate(), project
);
 
         config.setEclipseProjectName( projectName );
+        
+        config.setWtpapplicationxml(wtpapplicationxml);
 
         Set convertedBuildCommands = new LinkedHashSet();
 
@@ -1161,5 +1189,12 @@
             return IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE;
         }
         return IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getProjectNameForArifact(Artifact artifact) {
+        return IdeUtils.getProjectName(calculateProjectNameTemplate(), artifact);
     }
 }

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
Tue Sep 11 18:59:55 2007
@@ -123,6 +123,10 @@
     
     private String contextName;
     
+    /**
+     * @see EclipsePlugin#wtpapplicationxml()
+     */
+    private boolean wtpapplicationxml;
     
     /**
      * Getter for <code>deps</code>.
@@ -416,4 +420,13 @@
         this.contextName = deployName;
     }
     
+    public boolean getWtpapplicationxml()
+    {
+         return this.wtpapplicationxml;
+    }
+    
+    public void setWtpapplicationxml( boolean wtpapplicationxml )
+    {
+        this.wtpapplicationxml = wtpapplicationxml;
+    }    
 }

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
Tue Sep 11 18:59:55 2007
@@ -19,6 +19,7 @@
 package org.apache.maven.plugin.eclipse.writers.wtp;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.Messages;
 import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
@@ -27,8 +28,11 @@
 import org.apache.maven.plugin.ide.JeeUtils;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.xml.XMLWriter;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Base class to hold common constants used by extending classes.
@@ -149,7 +153,7 @@
      * @param basedir
      * @throws MojoExecutionException
      */
-    protected void addDependency( XMLWriter writer, IdeDependency dep, ArtifactRepository
localRepository, File basedir )
+    protected void addDependency( XMLWriter writer, IdeDependency dep, ArtifactRepository
localRepository, File basedir, String deployPath )
         throws MojoExecutionException
     {
         String handle;
@@ -161,7 +165,7 @@
             // <dependency-type>uses</dependency-type>
             // </dependent-module>
 
-            handle = "module:/resource/" + dep.getArtifactId() + "/" + dep.getArtifactId();
//$NON-NLS-1$ //$NON-NLS-2$
+            handle = "module:/resource/" + dep.getEclipseProjectName() + "/" + dep.getEclipseProjectName();
//$NON-NLS-1$ //$NON-NLS-2$
         }
         else
         {
@@ -199,7 +203,9 @@
 
         writer.startElement( ELT_DEPENDENT_MODULE );
 
-        writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/lib" ); //$NON-NLS-1$
+        writer.addAttribute( "archiveName",dep.getEclipseProjectName()+"."+dep.getType());

+
+        writer.addAttribute( ATTR_DEPLOY_PATH, deployPath ); //$NON-NLS-1$
         writer.addAttribute( ATTR_HANDLE, handle );
 
         writer.startElement( ELT_DEPENDENCY_TYPE );
@@ -212,7 +218,15 @@
     protected void writeWarOrEarResources( XMLWriter writer, MavenProject project, ArtifactRepository
localRepository )
         throws MojoExecutionException
     {
-
+        // use /WEB-INF/lib for war projects and / or the configured defaultLibBundleDir
for ear projects  
+    	String deployDir = IdeUtils.getPluginSetting( config.getProject(), ARTIFACT_MAVEN_EAR_PLUGIN,
+                "defaultLibBundleDir",
+                "/" );
+        
+        if (project.getPackaging().equals("war")) 
+        {
+            deployDir = "/WEB-INF/lib";
+        }
         // dependencies
         for ( int j = 0; j < config.getDeps().length; j++ )
         {
@@ -220,11 +234,11 @@
             String type = dep.getType();
 
             // NB war is needed for ear projects, we suppose nobody adds a war dependency
to a war/jar project
-            // exclude test and provided deps
-            if ( ( !dep.isTestDependency() && !dep.isProvided() )
+            // exclude test and provided and system dependencies outside the project 
+            if ( ( !dep.isTestDependency() && !dep.isProvided() && !dep.isSystemScopedOutsideProject(project))
                             && ( "jar".equals( type ) || "ejb".equals( type ) ||
"ejb-client".equals( type ) || "war".equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
//$NON-NLS-4$
             {
-                addDependency( writer, dep, localRepository, config.getProject().getBasedir()
);
+                addDependency( writer, dep, localRepository, config.getProject().getBasedir(),
deployDir );
             }
         }
     }

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=574764&r1=574763&r2=574764&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 Sep 11 18:59:55 2007
@@ -122,7 +122,8 @@
         }
         writer.startElement( ELT_WB_MODULE );
 
-        writer.addAttribute( ATTR_DEPLOY_NAME, config.getProject().getArtifactId() );
+        //we should use the eclipse project name as the deploy name.
+        writer.addAttribute( ATTR_DEPLOY_NAME, this.config.getEclipseProjectName() );
 
         // deploy-path is "/" for utility and ejb projects, "/WEB-INF/classes" for webapps
         String target = "/"; //$NON-NLS-1$
@@ -153,9 +154,12 @@
         }
         else if ( "ear".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
         {
+        	
+        	String defaultApplicationXML = config.getWtpapplicationxml()?"/target/eclipseEar":"/src/main/application";
+        	
             String earSourceDirectory = IdeUtils.getPluginSetting( config.getProject(), ARTIFACT_MAVEN_EAR_PLUGIN,
                                                                    "earSourceDirectory",
//$NON-NLS-1$
-                                                                   config.getProject().getBasedir()+"/src/main/application"
); //$NON-NLS-1$
+                                                                   config.getProject().getBasedir()+defaultApplicationXML);
//$NON-NLS-1$
             writer.startElement( ELT_WB_RESOURCE );
             writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
             writer.addAttribute( ATTR_SOURCE_PATH, IdeUtils

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
Tue Sep 11 18:59:55 2007
@@ -64,7 +64,8 @@
         writer.addAttribute( ATTR_MODULE_ID, "moduleCoreId" ); //$NON-NLS-1$
 
         writer.startElement( ELT_WB_MODULE );
-        writer.addAttribute( ATTR_DEPLOY_NAME, config.getProject().getArtifactId() );
+        // we should use the configured eclipse project name.
+        writer.addAttribute( ATTR_DEPLOY_NAME, this.config.getEclipseProjectName() );
 
         writer.startElement( ELT_MODULE_TYPE );
         writeModuleTypeAccordingToPackaging( config.getProject(), writer, config.getBuildOutputDirectory()
);

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=574764&r1=574763&r2=574764&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
Tue Sep 11 18:59:55 2007
@@ -633,10 +633,13 @@
                                 .getVersion(), art.getClassifier(), isReactorProject, Artifact.SCOPE_TEST.equals(
art
                                 .getScope() ), Artifact.SCOPE_SYSTEM.equals( art.getScope()
), Artifact.SCOPE_PROVIDED
                                 .equals( art.getScope() ), art.getArtifactHandler().isAddedToClasspath(),
-                                                                   art.getFile(), art.getType(),
isOsgiBundle,
-                                                                   osgiSymbolicName, dependencyDepth
);
-
-                            dependencies.add( dep );
+                                art.getFile(), art.getType(), isOsgiBundle, osgiSymbolicName,
dependencyDepth,
+                                getProjectNameForArifact(art));
+                            //no duplicate entries allowed. System paths can cause this problem.
+                            if ( !dependencies.contains(dep) )
+                            {
+                                dependencies.add( dep );
+                            }
                         }
 
                     }
@@ -656,7 +659,14 @@
 
         return ideDeps;
     }
-
+    
+    /**
+     * Find the name of the project as used in eclipse.
+     * @param artifact The artifact to find the eclipse name for.
+     * @return The name os the eclipse project.
+     */
+    abstract public String getProjectNameForArifact(Artifact artifact) ;
+    
     /**
      * Returns the list of project artifacts. Also artifacts
      * generated from referenced projects will be added, but

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java
Tue Sep 11 18:59:55 2007
@@ -20,6 +20,8 @@
 
 import java.io.File;
 
+import org.apache.maven.project.MavenProject;
+
 /**
  * @author Fabrizio Giustina
  * @version $Id$
@@ -98,6 +100,11 @@
     private boolean osgiBundle;
 
     /**
+     * How is this dependency called when it is an eclipse project. 
+     */
+    private String eclipseProjectName;
+    
+    /**
      * Creates an uninitialized instance
      */
     public IdeDependency()
@@ -120,10 +127,12 @@
      * @param osgiBundle Does this artifact contains a OSGI Manifest?
      * @param osgiSymbolicName Bundle-SymbolicName from the Manifest (if available)
      * @param dependencyDepth Depth of this dependency in the transitive dependency trail.
+     * @param eclipseProjectName The name of the project in eclipse
      */
     public IdeDependency( String groupId, String artifactId, String version, String classifier,
boolean referencedProject,
                           boolean testDependency, boolean systemScoped, boolean provided,
boolean addedToClasspath,
-                          File file, String type, boolean osgiBundle, String osgiSymbolicName,
int dependencyDepth )
+                          File file, String type, boolean osgiBundle, String osgiSymbolicName,
int dependencyDepth,
+                          String eclipseProjectName)
     {
         // group:artifact:version
         this.groupId = groupId;
@@ -143,6 +152,7 @@
         // file and type
         this.file = file;
         this.type = type;
+        this.eclipseProjectName = eclipseProjectName;
     }
 
     /**
@@ -398,6 +408,22 @@
     }
 
     /**
+     * Getter for <code>eclipseProjectName</code>.
+     * @return Returns the eclipseProjectName.
+     */
+    public String getEclipseProjectName() {
+        return this.eclipseProjectName;
+    }
+    
+    /**
+     * Setter for <code>eclipseProjectName</code>.
+     * @param eclipseProjectName The eclipseProjectName to set.
+     */
+    public void setEclipseProjectName(String eclipseProjectName) {
+        this.eclipseProjectName = eclipseProjectName;
+    }
+    
+    /**
      * @see java.lang.Object#toString()
      */
     public String toString()
@@ -412,6 +438,11 @@
     public int compareTo( Object o )
     {
         IdeDependency dep = (IdeDependency) o;
+        //in case of system scoped dependencies the files must be compared.
+        if (isSystemScoped() && dep.isSystemScoped() && getFile().equals(dep.getFile()))

+        {
+            return 0;
+        }
         int equals = this.getGroupId().compareTo( dep.getGroupId() );
         if ( equals != 0 )
         {
@@ -427,8 +458,44 @@
         {
             return equals;
         }
-
         return 0;
     }
 
+    /**
+     * Is this dependency System scoped outside the eclipse project. This is 
+     * NOT complete because in reality the check should mean that any module 
+     * in the reactor contains the system scope locally!
+     * @return Returns this dependency is systemScoped outside the project.
+     */
+    public boolean isSystemScopedOutsideProject( MavenProject project )
+    {
+        File modulesTop = project.getBasedir();
+        while (new File(modulesTop.getParentFile(), "pom.xml").exists())
+        {
+            modulesTop = modulesTop.getParentFile();
+        }
+        return isSystemScoped() && !getFile().getAbsolutePath().startsWith(modulesTop.getAbsolutePath());
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public boolean equals(Object obj) 
+    {
+        return compareTo(obj) == 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int hashCode() {
+        if (isSystemScoped()) 
+        {
+            return getFile().hashCode();
+        } 
+        else 
+        {
+            return this.getGroupId().hashCode() ^ this.getArtifactId().hashCode() ^ this.getType().hashCode();
+        }
+    }
 }

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=574764&r1=574763&r2=574764&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
Tue Sep 11 18:59:55 2007
@@ -195,6 +195,18 @@
         return getProjectName( template, dep.getGroupId(), dep.getArtifactId(), dep.getVersion()
);
     }
 
+    /**
+     * Use the project name template to create an eclipse project.
+     *  
+     * @param template Template for the project name
+     * @param artifact the artifact to create the project name for
+     * @return the created ide project name
+     */
+    public static String getProjectName( String template, Artifact artifact )
+    {
+        return getProjectName( template, artifact.getGroupId(), artifact.getArtifactId(),
artifact.getVersion() );
+    }
+    
     public static String getProjectName( String template, MavenProject project )
     {
         return getProjectName( template, project.getGroupId(), project.getArtifactId(), project.getVersion()
);

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Tue Sep 11 18:59:55 2007
@@ -342,6 +342,10 @@
         testProject( "project-32" );
     }
     
+    public void testProject34() throws Exception
+    {
+        testProject( "project-34" );
+    }
     
     /**
      * MECLIPSE-287 : dependencies with and without classifiers

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
Tue Sep 11 18:59:55 2007
@@ -5,7 +5,7 @@
       <property name="context-root" value="contextName"/>
     </module-type>
     <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-    <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar">
+    <dependent-module archiveName="maven-core.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.wtpmodules
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.wtpmodules?rev=574764&r1=574763&r2=574764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.wtpmodules
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.wtpmodules
Tue Sep 11 18:59:55 2007
@@ -5,8 +5,8 @@
       <property name="context-root" value="maven-eclipse-plugin-test-project-8"/>
     </module-type>
     <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-    <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/sysdep.jar">
+    <dependent-module archiveName="sysdep.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/sysdep.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>



Mime
View raw message