cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r417811 - in /cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse: EclipsePlugin.java writers/EclipseClasspathWriter.java
Date Wed, 28 Jun 2006 16:33:25 GMT
Author: reinhard
Date: Wed Jun 28 09:33:22 2006
New Revision: 417811

URL: http://svn.apache.org/viewvc?rev=417811&view=rev
Log:
PDE projects don't require projects dependencies to be added to .classpath but only to .project

Modified:
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
    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/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=417811&r1=417810&r2=417811&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Wed Jun 28 09:33:22 2006
@@ -85,6 +85,8 @@
     private static final String NATURE_PDE_PLUGIN = "org.eclipse.pde.PluginNature";  //$NON-NLS-1$
 
     private static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER = "org.eclipse.jdt.launching.JRE_CONTAINER";
//$NON-NLS-1$
+    
+    private static final String REQUIRED_PLUGINS_CONTAINER = "org.eclipse.pde.core.requiredPlugins";
//$NON-NLS-1$    
 
     //  warning, order is important for binary search
     public static final String[] WTP_SUPPORTED_VERSIONS = new String[] { "1.0", "1.5", "R7",
"none" }; //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
@@ -638,9 +640,9 @@
     {
         classpathContainers = new ArrayList();
         classpathContainers.add( COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER );
-        if( this.pde ) 
+        if ( pde )
         {
-//            classpathContainers.add( )
+            classpathContainers.add( REQUIRED_PLUGINS_CONTAINER );
         }
     }
 

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=417811&r1=417810&r2=417811&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:33:22 2006
@@ -210,7 +210,7 @@
         String sourcepath = null;
         String javadocpath = null;
 
-        if ( dep.isReferencedProject() )
+        if ( dep.isReferencedProject() && !inPdeMode )
         {
             path = "/" + dep.getArtifactId(); //$NON-NLS-1$
             kind = ATTR_SRC;



Mime
View raw message