You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2009/04/16 07:48:12 UTC

svn commit: r765473 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java

Author: aheritier
Date: Thu Apr 16 05:48:11 2009
New Revision: 765473

URL: http://svn.apache.org/viewvc?rev=765473&view=rev
Log:
MECLIPSE-546 : Aspectj libraries are included if using the aspectj jars from the springsource bundle repository

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

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=765473&r1=765472&r2=765473&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Thu Apr 16 05:48:11 2009
@@ -45,7 +45,7 @@
 
 /**
  * Writes eclipse .classpath file.
- * 
+ *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
  * @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
@@ -56,32 +56,32 @@
 {
 
     /**
-     * 
+     *
      */
     private static final String ORG_ECLIPSE_AJDT_INPATH = "org.eclipse.ajdt.inpath";
 
     /**
-     * 
+     *
      */
     private static final String ORG_ECLIPSE_AJDT_ASPECTPATH = "org.eclipse.ajdt.aspectpath";
 
     /**
-     * 
+     *
      */
     private static final String NAME = "name";
 
     /**
-     * 
+     *
      */
     private static final String VALUE = "value";
 
     /**
-     * 
+     *
      */
     private static final String ATTRIBUTE = "attribute";
 
     /**
-     * 
+     *
      */
     private static final String ATTRIBUTES = "attributes";
 
@@ -397,7 +397,7 @@
             writer.addAttribute( ATTR_PATH, (String) it.next() );
             writer.endElement(); // name
         }
-        
+
         writer.endElement();
 
         IOUtil.close( w );
@@ -526,7 +526,7 @@
         }
 
         // Skip aspectj libraries since they are in the container.
-        if ( ( config.getAjdtVersion() != 0 ) && dep.getArtifactId().toLowerCase().startsWith( "aspectj" ) )
+        if ( ( config.getAjdtVersion() != 0 ) && dep.getArtifactId().toLowerCase().indexOf( "aspectj" ) >= 0 )
         {
             return;
         }