Author: brett
Date: Thu Sep 8 10:22:59 2005
New Revision: 279588
URL: http://svn.apache.org/viewcvs?rev=279588&view=rev
Log:
apply changes from HEAD to fix id handling for the release
Added:
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/extend/base-different-ids.xml
- copied unchanged from r279587,
maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-different-ids.xml
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/extend/base-matching-ids.xml
- copied unchanged from r279587,
maven/maven-1/core/trunk/src/test/test-data/pom/extend/base-matching-ids.xml
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml
- copied unchanged from r279587,
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml
- copied unchanged from r279587,
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/extend/test-artifact-id-only.xml
- copied unchanged from r279587,
maven/maven-1/core/trunk/src/test/test-data/pom/extend/test-artifact-id-only.xml
Modified:
maven/maven-1/core/tags/maven-1.1-beta-2/src/java/org/apache/maven/project/Project.java
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/java/org/apache/maven/project/LegacyIdTest.java
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/dependencies.xml
Modified:
maven/maven-1/core/tags/maven-1.1-beta-2/src/java/org/apache/maven/project/Project.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/tags/maven-1.1-beta-2/src/java/org/apache/maven/project/Project.java?rev=279588&r1=279587&r2=279588&view=diff
==============================================================================
---
maven/maven-1/core/tags/maven-1.1-beta-2/src/java/org/apache/maven/project/Project.java
(original)
+++
maven/maven-1/core/tags/maven-1.1-beta-2/src/java/org/apache/maven/project/Project.java
Thu Sep 8 10:22:59 2005
@@ -99,6 +99,8 @@
private final Model model;
+ private String originalGroupId;
+
/**
* Default constructor.
*/
@@ -795,10 +797,10 @@
setShortDescription( parent.getShortDescription() );
}
- if ( model.getGroupId() == null && parent.model.getGroupId() != null )
+ if ( model.getGroupId() == null )
{
// Don't inherit if it was from an id element
- if ( parent.model.getId() == null ||
!parent.model.getGroupId().equals( parent.model.getId() ) )
+ if ( parent.originalGroupId != null || model.getId() == null )
{
model.setGroupId( parent.model.getGroupId() );
}
@@ -1363,6 +1365,7 @@
*/
public void resolveIds()
{
+ originalGroupId = model.getGroupId();
if ( model.getId() != null )
{
if ( model.getGroupId() == null )
@@ -1419,10 +1422,9 @@
else
{
dependency.setGroupId( id );
- dependency.setArtifactId( id );
}
}
- else if ( dependency.getArtifactId() == null )
+ if ( dependency.getArtifactId() == null )
{
dependency.setArtifactId( dependency.getId() );
}
@@ -1483,5 +1485,4 @@
{
return getId().hashCode();
}
-
}
Modified:
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/java/org/apache/maven/project/LegacyIdTest.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/tags/maven-1.1-beta-2/src/test/java/org/apache/maven/project/LegacyIdTest.java?rev=279588&r1=279587&r2=279588&view=diff
==============================================================================
---
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/java/org/apache/maven/project/LegacyIdTest.java
(original)
+++
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/java/org/apache/maven/project/LegacyIdTest.java
Thu Sep 8 10:22:59 2005
@@ -30,9 +30,10 @@
* @author Brett Porter <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Id$
*/
-public class LegacyIdTest extends TestCase
+public class LegacyIdTest
+ extends TestCase
{
- /**
+ /**
* Test for legacyToStandardId
*/
public void testLegacyToStandardId()
@@ -40,22 +41,19 @@
// test 'ant' -> 'ant:ant'
String legacyId = "ant";
String standardId = "ant:ant";
- assertEquals("Single id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
-
+ assertEquals( "Single id conversion failed", standardId,
Project.legacyToStandardId( legacyId ) );
+
// test 'ant:ant' unchanged
- legacyId = "ant:ant";
- assertEquals("Standard id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
+ legacyId = "ant:ant";
+ assertEquals( "Standard id conversion failed", standardId,
Project.legacyToStandardId( legacyId ) );
// test 'ant+optional' -> ant:ant-optional
legacyId = "ant+optional";
standardId = "ant:ant-optional";
- assertEquals("Plus format id conversion failed", standardId,
- Project.legacyToStandardId(legacyId));
+ assertEquals( "Plus format id conversion failed", standardId,
Project.legacyToStandardId( legacyId ) );
}
- /**
+ /**
* Test for legacyToDependencyKey
*/
public void testLegacyToDependencyId()
@@ -68,43 +66,36 @@
// test 'ant' -> 'ant:ant:jar'
String legacyId = "ant";
String standardId = "ant:ant:jar";
- assertEquals("Single id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
-
+ assertEquals( "Single id conversion failed", standardId,
project.legacyToDependencyKey( legacyId ) );
+
// test 'ant:ant' -> 'ant:ant:jar'
- legacyId = "ant:ant";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ legacyId = "ant:ant";
+ assertEquals( "Standard id conversion failed", standardId,
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));
+ assertEquals( "Plus format id conversion failed", standardId,
project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant:jar' unchanged
- legacyId = "ant:ant:jar";
+ legacyId = "ant:ant:jar";
standardId = "ant:ant:jar";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId,
project.legacyToDependencyKey( legacyId ) );
// test 'ant:ant:tld' unchanged
- legacyId = "ant:ant:tld";
+ legacyId = "ant:ant:tld";
standardId = "ant:ant:tld";
- assertEquals("Standard id conversion failed", standardId,
- project.legacyToDependencyKey(legacyId));
+ assertEquals( "Standard id conversion failed", standardId,
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));
+ 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));
+ assertEquals( "Standard id conversion failed", standardId,
project.legacyToDependencyKey( legacyId ) );
}
private static void addDependency( Project project, String groupId, String
artifactId, String type )
@@ -118,94 +109,140 @@
project.addDependency( dep );
}
- public void testIdOnly() throws Exception
+ 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() );
assertEquals( "check id", "artifactId:artifactId", p.getId() );
}
-
- public void testGroupIdAndArtifactId() throws Exception
+
+ public void testGroupIdAndArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/test-group-id-and-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/test-group-id-and-artifact-id.xml" ) );
assertEquals( "check id", "groupId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "groupId", p.getGroupId() );
assertEquals( "check id", "groupId:artifactId", p.getId() );
}
-
- public void testGroupIdAndIdAsArtifactId() throws Exception
+
+ public void testGroupIdAndIdAsArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/test-group-id-and-id-as-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
+
"src/test/test-data/pom/test-group-id-and-id-as-artifact-id.xml" ) );
assertEquals( "check id", "groupId:artifactId", p.getId() );
assertEquals( "check artifact id", "artifactId", p.getArtifactId() );
assertEquals( "check group id", "groupId", p.getGroupId() );
assertEquals( "check id", "groupId:artifactId", p.getId() );
}
-
- public void testExtendNone() throws Exception
+
+ public void testExtendNone()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/extend/test-none.xml" ) );
+ assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ }
+
+ public void testExtendIdOnly()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/extend/test-id-only.xml" ) );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
+ assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
+ assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
+ }
+
+ public void testExtendArtifactIdOnly()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/extend/test-none.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/extend/test-artifact-id-only.xml" ) );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
+ assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
assertEquals( "check group id", "base-groupId", p.getGroupId() );
+ assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
+ }
+
+ public void testExtendArtifactIdOnlyOverMatching()
+ throws Exception
+ {
+ Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
+
"src/test/test-data/pom/extend/test-artifact-id-only-over-matching.xml" ) );
+ assertEquals( "check id", "base-id:extend-artifactId", p.getId() );
+ assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
+ assertEquals( "check group id", "base-id", p.getGroupId() );
+ assertEquals( "check id", "base-id:extend-artifactId", p.getId() );
}
-
- public void testExtendIdOnly() throws Exception
+
+ public void testExtendArtifactIdOnlyOverDifferent()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/extend/test-id-only.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
+
"src/test/test-data/pom/extend/test-artifact-id-only-over-different.xml" ) );
assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
assertEquals( "check group id", "base-groupId", p.getGroupId() );
assertEquals( "check id", "base-groupId:extend-artifactId", p.getId()
);
}
-
- public void testExtendIdOverrideGroupId() throws Exception
+
+ public void testExtendIdOverrideGroupId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/extend/test-id-override-groupid.xml" ) );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/extend/test-id-override-groupid.xml" ) );
assertEquals( "check id", "extend-artifactId:extend-artifactId",
p.getId() );
assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
assertEquals( "check group id", "extend-artifactId", p.getGroupId() );
assertEquals( "check id", "extend-artifactId:extend-artifactId",
p.getId() );
}
-
- public void testExtendGroupIdAndArtifactId() throws Exception
+
+ public void testExtendGroupIdAndArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/extend/test-group-id-and-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
+
"src/test/test-data/pom/extend/test-group-id-and-artifact-id.xml" ) );
assertEquals( "check id", "extend-groupId:extend-artifactId",
p.getId() );
assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
assertEquals( "check group id", "extend-groupId", p.getGroupId() );
assertEquals( "check id", "extend-groupId:extend-artifactId",
p.getId() );
}
-
- public void testExtendGroupIdAndIdAsArtifactId() throws Exception
+
+ public void testExtendGroupIdAndIdAsArtifactId()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/extend/test-group-id-and-id-as-artifact-id.xml" ) );
+ Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
+
"src/test/test-data/pom/extend/test-group-id-and-id-as-artifact-id.xml" ) );
assertEquals( "check id", "extend-groupId:extend-artifactId",
p.getId() );
assertEquals( "check artifact id", "extend-artifactId",
p.getArtifactId() );
assertEquals( "check group id", "extend-groupId", p.getGroupId() );
assertEquals( "check id", "extend-groupId:extend-artifactId",
p.getId() );
}
- public void testDependencies() throws Exception
+ public void testDependencies()
+ throws Exception
{
- Project p = MavenUtils.getProject( new File( System.getProperty(
"basedir" ),
-
"src/test/test-data/pom/dependencies.xml" ) );
- assertEquals( "check id", "ant:ant",
p.getDependency("ant:ant").getId() );
- assertEquals( "check id with +", "ant:ant-optional",
p.getDependency("ant:ant-optional").getId() );
- assertEquals( "check id with -", "ant-optional:ant-optional",
p.getDependency("ant-optional:ant-optional").getId() );
+ Project p = MavenUtils.getProject(
+ new File( System.getProperty( "basedir" ),
"src/test/test-data/pom/dependencies.xml" ) );
+ assertEquals( "check id", "ant:ant", p.getDependency( "ant:ant"
).getId() );
+ assertEquals( "check id with +", "ant:ant-optional", p.getDependency(
"ant:ant-optional" ).getId() );
+ assertEquals( "check id with -", "ant-optional:ant-optional",
+ p.getDependency( "ant-optional:ant-optional" ).getId() );
+ assertEquals( "check id with id and artifactId", "groupId:artifactId",
+ p.getDependency( "groupId:artifactId" ).getId() );
}
/**
* Generate the test suite.
+ *
* @return the test suite
*/
public static Test suite()
Modified:
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/dependencies.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/dependencies.xml?rev=279588&r1=279587&r2=279588&view=diff
==============================================================================
---
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/dependencies.xml
(original)
+++
maven/maven-1/core/tags/maven-1.1-beta-2/src/test/test-data/pom/dependencies.xml
Thu Sep 8 10:22:59 2005
@@ -41,5 +41,10 @@
<classloader>root</classloader>
</properties>
</dependency>
+ <dependency>
+ <id>groupId</id>
+ <artifactId>artifactId</artifactId>
+ <version>version</version>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
