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/10/30 22:32:31 UTC
svn commit: r329655 - in
/maven/components/trunk/maven-plugins/maven-eclipse-plugin: ./
src/test/java/org/apache/maven/plugin/eclipse/ src/test/projects/project-1/
src/test/projects/project-2/ src/test/projects/project-3/
src/test/projects/project-4/ s...
Author: fgiust
Date: Sun Oct 30 13:32:13 2005
New Revision: 329655
URL: http://svn.apache.org/viewcvs?rev=329655&view=rev
Log:
adding testcase for MNG-1329 duplicate project references (already working)
renaming project.xml->pom.xml in test projects according to m2 standard
Added:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/pom.xml
- copied unchanged from r329417, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/pom.xml
- copied unchanged from r329417, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/pom.xml
- copied unchanged from r329417, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/pom.xml
- copied unchanged from r329417, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/pom.xml
- copied unchanged from r329636, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/pom.xml
- copied unchanged from r329417, maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/classpath
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml (with props)
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/project
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/wtpmodules
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/repository/maven/jars/maven-core-98.0-tests.jar
Removed:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-1/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-2/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-3/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-5/project.xml
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-6/project.xml
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/ (props changed)
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project
Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 30 13:32:13 2005
@@ -4,3 +4,4 @@
.wtpmodules
.project
.classpath
+.settings
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=329655&r1=329654&r2=329655&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Sun Oct 30 13:32:13 2005
@@ -78,6 +78,19 @@
testProject( "project-6", null );
}
+ public void testProject7()
+ throws Exception
+ {
+ testProject( "project-7", null );
+ }
+
+ // @todo testcase for MNG-1324 "System" dependencies path non correctly added to eclipse buildpath
+ // public void testProject8()
+ // throws Exception
+ // {
+ // testProject( "project-8", null );
+ // }
+
private void testProject( String projectName, File outputDir )
throws Exception
{
@@ -90,13 +103,14 @@
File repo = getTestFile( "src/test/repository" );
ArtifactRepositoryLayout localRepositoryLayout = (ArtifactRepositoryLayout) lookup(
- ArtifactRepositoryLayout.ROLE, "legacy" );
+ ArtifactRepositoryLayout.ROLE,
+ "legacy" );
- ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" + repo.getAbsolutePath(),
+ ArtifactRepository localRepository = new DefaultArtifactRepository( "local",
+ "file://" + repo.getAbsolutePath(),
localRepositoryLayout );
- MavenProject project = builder
- .buildWithDependencies( new File( basedir, "project.xml" ), localRepository, null );
+ MavenProject project = builder.buildWithDependencies( new File( basedir, "pom.xml" ), localRepository, null );
File projectOutputDir = basedir;
@@ -150,14 +164,14 @@
plugin.execute();
- assertFileEquals( localRepository.getBasedir(), new File( basedir, "project" ),
- new File( projectOutputDir, ".project" ) );
+ assertFileEquals( localRepository.getBasedir(), new File( basedir, "project" ), new File( projectOutputDir,
+ ".project" ) );
- assertFileEquals( localRepository.getBasedir(), new File( basedir, "classpath" ),
- new File( projectOutputDir, ".classpath" ) );
+ assertFileEquals( localRepository.getBasedir(), new File( basedir, "classpath" ), new File( projectOutputDir,
+ ".classpath" ) );
- assertFileEquals( localRepository.getBasedir(), new File( basedir, "wtpmodules" ),
- new File( projectOutputDir, ".wtpmodules" ) );
+ assertFileEquals( localRepository.getBasedir(), new File( basedir, "wtpmodules" ), new File( projectOutputDir,
+ ".wtpmodules" ) );
if ( new File( basedir, "settings" ).exists() )
{
@@ -184,8 +198,8 @@
if ( actualLines.size() <= i )
{
- fail( "Too few lines in the actual file. Was " + actualLines.size() + ", expected: " +
- expectedLines.size() );
+ fail( "Too few lines in the actual file. Was " + actualLines.size() + ", expected: "
+ + expectedLines.size() );
}
String actual = actualLines.get( i ).toString();
@@ -213,8 +227,7 @@
while ( ( line = reader.readLine() ) != null )
{
- lines.add(
- line );//StringUtils.replace( line, "#ArtifactRepositoryPath#", mavenRepo.replace( '\\', '/' ) ) );
+ lines.add( line );//StringUtils.replace( line, "#ArtifactRepositoryPath#", mavenRepo.replace( '\\', '/' ) ) );
}
return lines;
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project?rev=329655&r1=329654&r2=329655&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-4/project Sun Oct 30 13:32:13 2005
@@ -13,9 +13,9 @@
</natures>
<linkedResources>
<link>
- <name>project.xml</name>
+ <name>pom.xml</name>
<type>1</type>
- <location>${basedir}/src/test/projects/project-4/project.xml</location>
+ <location>${basedir}/src/test/projects/project-4/pom.xml</location>
</link>
<link>
<name>src-main-java</name>
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/classpath
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/classpath?rev=329655&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/classpath (added)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/classpath Sun Oct 30 13:32:13 2005
@@ -0,0 +1,6 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0-tests.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/maven/jars/maven-core-98.0.jar" sourcepath="M2_REPO/maven/java-sources/maven-core-98.0-sources.jar"/>
+</classpath>
\ No newline at end of file
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml?rev=329655&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml (added)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml Sun Oct 30 13:32:13 2005
@@ -0,0 +1,23 @@
+<?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>
+ <packaging>war</packaging>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-7</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <dependencies>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>98.0</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <classifier>tests</classifier>
+ <version>98.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/project
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/project?rev=329655&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/project (added)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/project Sun Oct 30 13:32:13 2005
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-7</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>
\ No newline at end of file
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/wtpmodules
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/wtpmodules?rev=329655&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/wtpmodules (added)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-7/wtpmodules Sun Oct 30 13:32:13 2005
@@ -0,0 +1,15 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-7">
+ <module-type module-type-id="jst.web">
+ <version>2.4</version>
+ <property name="context-root" value="maven-eclipse-plugin-test-project-7"/>
+ </module-type>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/jars/maven-core-98.0-tests.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/jars/maven-core-98.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/repository/maven/jars/maven-core-98.0-tests.jar
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/repository/maven/jars/maven-core-98.0-tests.jar?rev=329655&view=auto
==============================================================================
(empty)