You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/12/28 10:14:39 UTC
svn commit: r359452 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/
main/resources/org/apache/maven/plugin/eclipse/
test/java/org/apache/maven/plugin/ecli...
Author: fgiust
Date: Wed Dec 28 01:14:23 2005
New Revision: 359452
URL: http://svn.apache.org/viewcvs?rev=359452&view=rev
Log:
MECLIPSE-33 attaching javadoc jars to eclipse dependencies
javadoc jars are now automatically used when a source archive is not available (when a source jar is attached there is no need for an additional javadoc jar), useful for closed-source projects.
Testcase #10 added
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0-javadoc.jar
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.jar
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.pom
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/settings
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/wtpmodules
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=359452&r1=359451&r2=359452&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Wed Dec 28 01:14:23 2005
@@ -26,8 +26,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -388,39 +386,23 @@
{
Artifact artifact = (Artifact) it.next();
- if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
- {
- missingSourceArtifacts.add( artifact );
- continue;
- }
- else if ( reactorArtifacts.contains( artifact ) )
+ if ( reactorArtifacts.contains( artifact ) )
{
// source artifact not needed
continue;
}
// source artifact: use the "sources" classifier added by the source plugin
- Artifact sourceArtifact = artifactFactory.createArtifactWithClassifier( artifact.getGroupId(), artifact
- .getArtifactId(), artifact.getVersion(), "java-source", "sources" ); //$NON-NLS-1$ //$NON-NLS-2$
-
- try
- {
- artifactResolver.resolve( sourceArtifact, remoteRepos, localRepository );
- }
- catch ( ArtifactNotFoundException e )
- {
- // ignore, the jar has not been found
- }
- catch ( ArtifactResolutionException e )
- {
- String message = Messages.getString( "EclipseClasspathWriter.errorresolvingsources", //$NON-NLS-1$
- new Object[] { sourceArtifact.getId(), e.getMessage() } );
-
- throw new MojoExecutionException( message, e );
- }
+ Artifact sourceArtifact = EclipseUtils.resolveArtifactWithClassifier( artifact, "sources", localRepository,
+ artifactResolver, artifactFactory,
+ remoteRepos );
if ( !sourceArtifact.isResolved() )
{
+ // try using a plain javadoc jar if the source jar is not available
+ EclipseUtils.resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver,
+ artifactFactory, remoteRepos );
+
missingSourceArtifacts.add( artifact );
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java?rev=359452&r1=359451&r2=359452&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java Wed Dec 28 01:14:23 2005
@@ -305,7 +305,8 @@
/**
* @todo MNG-1379 Wrong path for artifacts with system scope
- * Artifacts with a system scope have a wrong path in mvn 2.0. This is a temporary workaround.
+ * Artifacts with a system scope have a wrong path in mvn 2.0.
+ * This is fixed in mvn 2.0.1 but this method is needed for compatibility with the 2.0 release. Do not remove!
*/
public static void fixSystemScopeArtifacts( Collection artifacts, Collection dependencies )
{
@@ -367,18 +368,43 @@
}
}
- public static Artifact resolveSourceArtifact( Artifact artifact, ArtifactRepository localRepository,
- ArtifactResolver artifactResolver, ArtifactFactory artifactFactory )
+ public static Artifact resolveLocalSourceArtifact( Artifact artifact, ArtifactRepository localRepository,
+ ArtifactResolver artifactResolver, ArtifactFactory artifactFactory )
throws MojoExecutionException
{
- // source artifact: use the "sources" classifier added by the source plugin
- Artifact sourceArtifact = artifactFactory.createArtifactWithClassifier( artifact.getGroupId(), artifact
- .getArtifactId(), artifact.getVersion(), "java-source", "sources" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return resolveArtifactWithClassifier( artifact, "sources", localRepository, artifactResolver, artifactFactory,
+ new ArrayList( 0 ) );
+ }
- try
+ public static Artifact resolveLocalJavadocArtifact( Artifact artifact, ArtifactRepository localRepository,
+ ArtifactResolver artifactResolver,
+ ArtifactFactory artifactFactory )
+ throws MojoExecutionException
+ {
+ return resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver, artifactFactory,
+ new ArrayList( 0 ) );
+ }
+
+ public static Artifact resolveArtifactWithClassifier( Artifact artifact, String classifier,
+ ArtifactRepository localRepository,
+ ArtifactResolver artifactResolver,
+ ArtifactFactory artifactFactory, List remoteRepos )
+ throws MojoExecutionException
+ {
+ String type = classifier;
+
+ // the "sources" classifier maps to the "java-source" type
+ if ( "sources".equals( type ) )
{
+ type = "java-source";
+ }
- artifactResolver.resolve( sourceArtifact, new ArrayList(), localRepository );
+ Artifact resolvedArtifact = artifactFactory.createArtifactWithClassifier( artifact.getGroupId(), artifact
+ .getArtifactId(), artifact.getVersion(), type, classifier );
+
+ try
+ {
+ artifactResolver.resolve( resolvedArtifact, remoteRepos, localRepository );
}
catch ( ArtifactNotFoundException e )
{
@@ -386,13 +412,13 @@
}
catch ( ArtifactResolutionException e )
{
- String message = Messages.getString( "EclipseClasspathWriter.errorresolvingsources", //$NON-NLS-1$
- new Object[] { sourceArtifact.getId(), e.getMessage() } );
+ String message = Messages.getString( "EclipsePlugin.errorresolving", //$NON-NLS-1$
+ new Object[] { classifier, resolvedArtifact.getId(), e.getMessage() } );
throw new MojoExecutionException( message, e );
}
- return sourceArtifact;
+ return resolvedArtifact;
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=359452&r1=359451&r2=359452&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 Wed Dec 28 01:14:23 2005
@@ -34,6 +34,7 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
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;
@@ -157,6 +158,7 @@
String path;
String kind;
String sourcepath = null;
+ String javadocpath = null;
if ( referencedReactorArtifacts.contains( artifact ) )
{
@@ -194,7 +196,7 @@
path = "M2_REPO/" //$NON-NLS-1$
+ EclipseUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
- Artifact sourceArtifact = EclipseUtils.resolveSourceArtifact( artifact, localRepository,
+ Artifact sourceArtifact = EclipseUtils.resolveLocalSourceArtifact( artifact, localRepository,
artifactResolver, artifactFactory );
if ( sourceArtifact.isResolved() )
@@ -202,6 +204,26 @@
sourcepath = "M2_REPO/" //$NON-NLS-1$
+ EclipseUtils.toRelativeAndFixSeparator( localRepositoryFile, sourceArtifact.getFile(), false );
}
+ else
+ {
+
+ // if a source artifact is not available, try with a plain javadoc jar
+ Artifact javadocArtifact = EclipseUtils.resolveLocalJavadocArtifact( artifact, localRepository, artifactResolver, artifactFactory );
+ if ( javadocArtifact.isResolved() )
+ {
+ try
+ {
+ // NB eclipse (3.1) doesn't support variables in javadoc paths, so we need to add the
+ // full path for the maven repo
+ javadocpath = StringUtils.replace( javadocArtifact.getFile().getCanonicalPath(), "\\", "/" );
+ }
+ catch ( IOException e )
+ {
+ // should never happen
+ throw new MojoExecutionException( e.getMessage(), e );
+ }
+ }
+ }
kind = "var"; //$NON-NLS-1$
}
@@ -215,6 +237,17 @@
if ( sourcepath != null )
{
writer.addAttribute( "sourcepath", sourcepath ); //$NON-NLS-1$
+ }
+ else if ( javadocpath != null )
+ {
+ writer.startElement( "attributes" ); //$NON-NLS-1$
+
+ writer.startElement( "attribute" ); //$NON-NLS-1$
+ writer.addAttribute( "value", "jar:file:/" + javadocpath + "!/" );
+ writer.addAttribute( "name", "javadoc_location" );
+ writer.endElement();
+
+ writer.endElement();
}
writer.endElement();
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties?rev=359452&r1=359451&r2=359452&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties Wed Dec 28 01:14:23 2005
@@ -9,7 +9,7 @@
EclipsePlugin.keepexisting=File {0} already exists.\n Additional settings will be preserved, run mvn eclipse:clean if you want old settings to be removed.
EclipsePlugin.cantparseexisting=Unable to parse existing file: {0}. Settings will not be preserved.
EclipsePlugin.cantresolvesources=Cannot resolve source artifact. Artifact id: {0} (Message: {1})
-EclipsePlugin.errorresolvingsources=Error resolving source artifact. Artifact id: {0} (Message: {1})
+EclipsePlugin.errorresolving=Error resolving {0} artifact. Artifact id: {1} (Message: {2})
EclipsePlugin.wrote=Wrote Eclipse project for "{0}" to {1}.
EclipsePlugin.missingelement=Missing element from the project descriptor: "{0}"
EclipsePlugin.includenotsupported=This plugin currently doesn't support include patterns for resources. Adding the entire directory.
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java?rev=359452&r1=359451&r2=359452&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java Wed Dec 28 01:14:23 2005
@@ -135,6 +135,8 @@
// replace some vars in the expected line, to account
// for absolute paths that are different on each installation.
expected = StringUtils.replace( expected, "${basedir}", basedir );
+ expected = StringUtils.replace( expected, "${M2_REPO}", localRepositoryDir.getCanonicalPath()
+ .replace( '\\', '/' ) );
if ( actualLines.size() <= i )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=359452&r1=359451&r2=359452&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Wed Dec 28 01:14:23 2005
@@ -78,4 +78,10 @@
testProject( "project-9" );
}
+ public void testProject10()
+ throws Exception
+ {
+ testProject( "project-10" );
+ }
+
}
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0-javadoc.jar
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0-javadoc.jar?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0-javadoc.jar (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0-javadoc.jar Wed Dec 28 01:14:23 2005
@@ -0,0 +1 @@
+dummy file
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.jar
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.jar?rev=359452&view=auto
==============================================================================
(empty)
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.pom
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.pom?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.pom (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/junit/junit/3.0/junit-3.0.pom Wed Dec 28 01:14:23 2005
@@ -0,0 +1,7 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <packaging>jar</packaging>
+ <version>3.0</version>
+</model>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/.wtpmodules
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/.wtpmodules?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/.wtpmodules (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/.wtpmodules Wed Dec 28 01:14:23 2005
@@ -0,0 +1,8 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-2">
+ <module-type module-type-id="jst.utility">
+ <property name="java-output-path" value="/target/classes"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/classpath
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/classpath?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/classpath Wed Dec 28 01:14:23 2005
@@ -0,0 +1,10 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.0/junit-3.0.jar">
+ <attributes>
+ <attribute value="jar:file:/${M2_REPO}/junit/junit/3.0/junit-3.0-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+</classpath>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml Wed Dec 28 01:14:23 2005
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-2</artifactId>
+ <version>88.0</version>
+ <name>Maven</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/project
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/project?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/project Wed Dec 28 01:14:23 2005
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-2</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/settings
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/settings?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/settings (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/settings Wed Dec 28 01:14:23 2005
@@ -0,0 +1,3 @@
+#Fri Aug 26 21:33:13 CEST 2005
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java Wed Dec 28 01:14:23 2005
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class DummyClass
+{
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/wtpmodules
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/wtpmodules?rev=359452&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/wtpmodules (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-10/wtpmodules Wed Dec 28 01:14:23 2005
@@ -0,0 +1,8 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-2">
+ <module-type module-type-id="jst.utility">
+ <property name="java-output-path" value="/target/classes"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file