svn commit: r825429 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse: reader/ReadWorkspaceLocations.java writers/EclipseClasspathWriter.java

[nicolas]

Author: nicolas
Date: Thu Oct 15 08:07:26 2009
New Revision: 825429

URL: http://svn.apache.org/viewvc?rev=825429&view=rev
Log:
[MECLIPSE-558] Ignoring listed AspectJ dependencies

o only exclude org.aspectj:aspectjrt and not other aspectJ artifacts (not 
included in AJDT Runtime)
o automatically declare the ASPECTJRT_CONTAINER when ajdtversion is set

Modified:
    
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
    
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/reader/ReadWorkspaceLocations.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=825429&r1=825428&r2=825429&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
 Thu Oct 15 08:07:26 2009
@@ -532,6 +532,7 @@
                             getProjectLocation( 
workspaceConfiguration.getWorkspaceDirectory(), project );
                         if ( projectLocation != null )
                         {
+                                                   logger.debug( "read 
workpsace project " + projectLocation );
                             IdeDependency ideDependency = readArtefact( 
projectLocation, logger );
                             if ( ideDependency != null )
                             {
@@ -546,6 +547,7 @@
                 }
             }
         }
+               logger.debug( dependencies.size() + " from workspace " + 
workspaceConfiguration.getWorkspaceDirectory() );
         workspaceConfiguration.setWorkspaceArtefacts( (IdeDependency[]) 
dependencies.toArray( new IdeDependency[dependencies.size()] ) );
     }
 }

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=825429&r1=825428&r2=825429&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 Oct 15 08:07:26 2009
@@ -64,7 +64,9 @@
      *
      */
     private static final String ORG_ECLIPSE_AJDT_ASPECTPATH = 
"org.eclipse.ajdt.aspectpath";
-
+     
+    private static final String ASPECTJRT_CONTAINER = 
"org.eclipse.ajdt.core.ASPECTJRT_CONTAINER";
+       
     /**
      *
      */
@@ -525,9 +527,13 @@
 
         }
 
-        // Skip aspectj libraries since they are in the container.
-        if ( ( config.getAjdtVersion() != 0 ) && 
dep.getArtifactId().toLowerCase().indexOf( "aspectj" ) >= 0 )
+        // Replace aspectJ runtime library with ajdt ASPECTJRT_CONTAINER.
+        if ( ( config.getAjdtVersion() != 0 ) && dep.getGroupId().equals( 
"org.aspectj" ) && dep.getArtifactId().equals( "aspectjrt" ) )
         {
+            writer.startElement( ELT_CLASSPATHENTRY );
+            writer.addAttribute( ATTR_KIND, "con" );
+            writer.addAttribute( ATTR_PATH, ASPECTJRT_CONTAINER );
+            writer.endElement();
             return;
         }