svn commit: r553266 - in /maven/plugins/branches/maven-eclipse-plugin-151-287/src: main/java/org/apache/maven/plugin/eclipse/writers/ test/java/org/apache/maven/plugin/eclipse/ test/resources/m2repo/maven/maven-core/98.0/ test/resources/projects/projec...

[br...@apache.org]

Author: brianf
Date: Wed Jul  4 09:47:57 2007
New Revision: 553266

URL: http://svn.apache.org/viewvc?view=rev&rev=553266
Log:
applied max's patch for the tests.

Added:
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/m2repo/maven/maven-core/98.0/maven-core-98.0-test-sources.jar
      - copied unchanged from r553246, maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/m2repo/maven/maven-core/98.0/maven-core-98.0-tests-sources.jar
Removed:
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/m2repo/maven/maven-core/98.0/maven-core-98.0-tests-sources.jar
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-35/
Modified:
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/expected/.classpath
    maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/pom.xml

Modified: maven/plugins/branches/maven-eclipse-plugin-151-287/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-151-287/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?view=diff&rev=553266&r1=553265&r2=553266
==============================================================================
--- maven/plugins/branches/maven-eclipse-plugin-151-287/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/branches/maven-eclipse-plugin-151-287/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Wed Jul  4 09:47:57 2007
@@ -337,7 +337,8 @@
 
             if ( dep.isAddedToClasspath() )
             {
-                String depId = dep.getGroupId() + ":" + dep.getArtifactId() + ":" + dep.getVersion();
+                String depId = dep.getGroupId() + ":" + dep.getArtifactId() + ":" + dep.getClassifier() + ":"
+						+ dep.getVersion();
                 /* avoid duplicates in the classpath for artifacts with different types (like ejbs) */
                 if ( !addedDependencies.contains( depId ) )
                 {

Modified: maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?view=diff&rev=553266&r1=553265&r2=553266
==============================================================================
--- maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Wed Jul  4 09:47:57 2007
@@ -338,14 +338,6 @@
     }
     
     /**
-     * Checks that the test-sources jar gets the right name.
-     * @throws Exception any exception thrown during test
-     */
-     public void testProject35() throws Exception
-        {
-            testProject( "project-35" );
-        }
-    /**
      * MECLIPSE-287 : dependencies with and without classifiers
      * MECLIPSE-151 : test jar source attachments
      * 

Modified: maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/expected/.classpath?view=diff&rev=553266&r1=553265&r2=553266
==============================================================================
--- maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/expected/.classpath (original)
+++ maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/expected/.classpath Wed Jul  4 09:47:57 2007
@@ -3,4 +3,4 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-test-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar" sourcepath="M2_REPO/maven/maven-core/98.0/maven-core-98.0-sources.jar"/>
-</classpath>
+</classpath>
\ No newline at end of file

Modified: maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/pom.xml?view=diff&rev=553266&r1=553265&r2=553266
==============================================================================
--- maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/pom.xml (original)
+++ maven/plugins/branches/maven-eclipse-plugin-151-287/src/test/resources/projects/project-33/pom.xml Wed Jul  4 09:47:57 2007
@@ -3,8 +3,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>eclipse</groupId>
-  <artifactId>maven-eclipse-plugin-test-project-MECLIPSE-287</artifactId>
-  <version>MECLIPSE-287</version>
+  <artifactId>maven-eclipse-plugin-test-project-33</artifactId>
+  <version>33</version>
   <packaging>jar</packaging>
   <dependencies>
     <dependency>