cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r417817 - /cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Date Wed, 28 Jun 2006 16:52:35 GMT
Author: reinhard
Date: Wed Jun 28 09:52:34 2006
New Revision: 417817

URL: http://svn.apache.org/viewvc?rev=417817&view=rev
Log:
don't add provided dependencies in PDE mode as they are covered by the plugin container and
the choosen target platform

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

Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=417817&r1=417816&r2=417817&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
(original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Wed Jun 28 09:52:34 2006
@@ -264,15 +264,20 @@
                     path = pdeLibDir + "/" + dep.getFile().getName();
                     kind = ATTR_LIB;
                 }
-                
+                // running in PDE mode and the dependency is provided means, that it is provided
by
+                // the target platform. This case is covered by adding the plugin container
+                else if (inPdeMode && dep.isProvided() ) 
+                {
+                    return;
+                }                
                 else 
-                {           	
-	                String fullPath = artifactPath.getPath();
-	
-	                path = M2_REPO + "/" //$NON-NLS-1$
-	                    + IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File(
fullPath ), false );
-	
-	                kind = ATTR_VAR; //$NON-NLS-1$
+                {               
+                    String fullPath = artifactPath.getPath();
+    
+                    path = M2_REPO + "/" //$NON-NLS-1$
+                        + IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File(
fullPath ), false );
+    
+                    kind = ATTR_VAR; //$NON-NLS-1$
                 }
                 if ( dep.getSourceAttachment() != null )
                 {
@@ -316,4 +321,4 @@
 
     }
 
-}
+}
\ No newline at end of file



Mime
View raw message