You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/16 18:23:13 UTC
svn commit: r190946 - in /maven/maven-1/core/trunk/src:
java/org/apache/maven/project/Project.java
test/java/org/apache/maven/project/LegacyIdTest.java
Author: brett
Date: Thu Jun 16 09:23:12 2005
New Revision: 190946
URL: http://svn.apache.org/viewcvs?rev=190946&view=rev
Log:
better handling of legacy ids, compat with 1.0.2
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?rev=190946&r1=190945&r2=190946&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Thu Jun 16 09:23:12 2005
@@ -645,7 +645,7 @@
return newId;
}
- public static String legacyToDependencyKey( String id )
+ public String legacyToDependencyKey( String id )
{
String newId = legacyToStandardId( id );
int sepIndex = newId.indexOf( ':' );
@@ -654,6 +654,18 @@
sepIndex = newId.indexOf( ':', sepIndex + 1 );
if ( sepIndex < 0 )
{
+ for ( Iterator i = dependencyMap.keySet().iterator(); i.hasNext(); )
+ {
+ String depId = (String) i.next();
+ if ( depId.equals( newId ) )
+ {
+ return depId;
+ }
+ if ( depId.startsWith( newId + ":" ) )
+ {
+ return depId;
+ }
+ }
newId += ":jar";
}
return newId;
Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java?rev=190946&r1=190945&r2=190946&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java (original)
+++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/LegacyIdTest.java Thu Jun 16 09:23:12 2005
@@ -60,40 +60,68 @@
*/
public void testLegacyToDependencyId()
{
+ Project project = new Project();
+ addDependency( project, "ant", "ant", "jar" );
+ addDependency( project, "ant", "ant-optional", "jar" );
+ addDependency( project, "ant", "ant-windows", "dll" );
+
// test 'ant' -> 'ant:ant:jar'
String legacyId = "ant";
String standardId = "ant:ant:jar";
assertEquals("Single id conversion failed", standardId,
- Project.legacyToDependencyKey(legacyId));
+ project.legacyToDependencyKey(legacyId));
// test 'ant:ant' -> 'ant:ant:jar'
legacyId = "ant:ant";
assertEquals("Standard id conversion failed", standardId,
- Project.legacyToDependencyKey(legacyId));
+ project.legacyToDependencyKey(legacyId));
// test 'ant+optional' -> ant:ant-optional:jar
legacyId = "ant+optional";
standardId = "ant:ant-optional:jar";
assertEquals("Plus format id conversion failed", standardId,
- Project.legacyToDependencyKey(legacyId));
+ project.legacyToDependencyKey(legacyId));
// test 'ant:ant:jar' unchanged
legacyId = "ant:ant:jar";
standardId = "ant:ant:jar";
assertEquals("Standard id conversion failed", standardId,
- Project.legacyToDependencyKey(legacyId));
+ project.legacyToDependencyKey(legacyId));
// test 'ant:ant:tld' unchanged
legacyId = "ant:ant:tld";
standardId = "ant:ant:tld";
assertEquals("Standard id conversion failed", standardId,
- Project.legacyToDependencyKey(legacyId));
+ project.legacyToDependencyKey(legacyId));
+
+ // test 'ant:ant-windows' gets correct one
+ legacyId = "ant:ant-windows";
+ standardId = "ant:ant-windows:dll";
+ assertEquals("Standard id conversion failed", standardId,
+ project.legacyToDependencyKey(legacyId));
+
+ // test 'ant:ant-windows:dll' unchanged
+ legacyId = "ant:ant-windows:dll";
+ standardId = "ant:ant-windows:dll";
+ assertEquals("Standard id conversion failed", standardId,
+ project.legacyToDependencyKey(legacyId));
+ }
+
+ private static void addDependency( Project project, String groupId, String artifactId, String type )
+ {
+ Dependency dep = new Dependency();
+ dep.setId( groupId + ":" + artifactId );
+ dep.setGroupId( groupId );
+ dep.setArtifactId( artifactId );
+ dep.setType( type );
+ dep.setVersion( "1.0-SNAPSHOT" );
+ project.addDependency( dep );
}
public void testIdOnly() throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
- "src/test/test-data/pom/test-id-only.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty( "basedir" ),
+ "src/test/test-data/pom/test-id-only.xml" ) );
assertEquals( "check id", "artifactId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "artifactId", p.getGroupId() );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org