Author: fgiust
Date: Wed Jul 26 07:50:58 2006
New Revision: 425748
URL: http://svn.apache.org/viewvc?rev=425748&view=rev
Log:
fix phisical path of linked jars and add missing linkedResources tag
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=425748&r1=425747&r2=425748&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
Wed Jul 26 07:50:58 2006
@@ -33,6 +33,7 @@
import org.apache.maven.plugin.ide.IdeDependency;
import org.apache.maven.plugin.ide.IdeUtils;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -222,39 +223,47 @@
writer.endElement(); // natures
- if ( !config.getProjectBaseDir().equals(
config.getEclipseProjectDirectory() ) )
+ boolean addLinks = !config.getProjectBaseDir().equals(
config.getEclipseProjectDirectory() );
+
+ if ( addLinks || ( config.isPde() && config.getDeps().length > 0 ) )
{
writer.startElement( "linkedResources" ); //$NON-NLS-1$
- addFileLink( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config.getProject()
- .getFile() );
+ if ( addLinks )
+ {
- addSourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
- .getProject().getCompileSourceRoots() );
- addResourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
- .getProject().getBuild().getResources() );
+ addFileLink( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
+ .getProject().getFile() );
- addSourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
- .getProject().getTestCompileSourceRoots() );
- addResourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
- .getProject().getBuild().getTestResources() );
+ addSourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
+ .getProject().getCompileSourceRoots() );
+ addResourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
+ .getProject().getBuild().getResources() );
- writer.endElement(); // linedResources
- }
+ addSourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
+ .getProject().getTestCompileSourceRoots() );
+ addResourceLinks( writer, config.getProjectBaseDir(),
config.getEclipseProjectDirectory(), config
+ .getProject().getBuild().getTestResources() );
- if ( config.isPde() )
- {
- for ( int j = 0; j < config.getDeps().length; j++ )
- {
- IdeDependency dep = config.getDeps()[j];
+ }
- if ( dep.isAddedToClasspath() && !dep.isProvided() &&
!dep.isReferencedProject()
- && !dep.isTestDependency() )
+ if ( config.isPde() )
+ {
+ for ( int j = 0; j < config.getDeps().length; j++ )
{
- String name = dep.getFile().getName();
- addLink( writer, name, name, LINK_TYPE_FILE );
+ IdeDependency dep = config.getDeps()[j];
+
+ if ( dep.isAddedToClasspath() && !dep.isProvided() &&
!dep.isReferencedProject()
+ && !dep.isTestDependency() )
+ {
+ String name = dep.getFile().getName();
+ addLink( writer, name, StringUtils.replace(
IdeUtils.getCanonicalPath( dep.getFile() ), "\\",
+ "/" ),
LINK_TYPE_FILE );
+ }
}
}
+
+ writer.endElement(); // linkedResources
}
writer.endElement(); // projectDescription
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project?rev=425748&r1=425747&r2=425748&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project
Wed Jul 26 07:50:58 2006
@@ -20,9 +20,11 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
- <link>
- <name>junit-3.8.1.jar</name>
- <type>1</type>
- <location>junit-3.8.1.jar</location>
- </link>
+ <linkedResources>
+ <link>
+ <name>junit-3.8.1.jar</name>
+ <type>1</type>
+ <location>${M2_REPO}/junit/junit/3.8.1/junit-3.8.1.jar</location>
+ </link>
+ </linkedResources>
</projectDescription>
