You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/12/10 06:37:37 UTC
cvs commit: maven-components/maven-project/src/test-input project.xml
jvanzyl 2003/12/09 21:37:37
Modified: maven-project/src/java/org/apache/maven/project
DefaultProjectBuilder.java Project.java
maven-project/src/test/org/apache/maven/project
DefaultProjectBuilderTest.java
ProjectTestHelper.java
maven-project/src/test-input project.xml
Log:
o making necessary changes so that
- recursive property inheritance is correct
- recursive model inheritance is correct
Next to deal with the issue of interpolation in the model, where it is
necessary and how to deal with it in general.
Revision Changes Path
1.20 +1 -1 maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultProjectBuilder.java 10 Dec 2003 03:28:09 -0000 1.19
+++ DefaultProjectBuilder.java 10 Dec 2003 05:37:36 -0000 1.20
@@ -103,7 +103,7 @@
setupModelInheritance( project.getModel(), parent.getModel() );
- project.setInterpolatedModel( parent.getInterpolatedModel() );
+ //project.setInterpolatedModel( parent.getInterpolatedModel() );
}
project.setProperties( properties );
1.15 +27 -33 maven-components/maven-project/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Project.java 10 Dec 2003 05:09:10 -0000 1.14
+++ Project.java 10 Dec 2003 05:37:36 -0000 1.15
@@ -177,7 +177,7 @@
*/
public List getDependencies()
{
- return getInterpolatedModel().getDependencies();
+ return getModel().getDependencies();
}
// ----------------------------------------------------------------------
@@ -260,12 +260,12 @@
public String getModelVersion()
{
- return getInterpolatedModel().getModelVersion();
+ return getModel().getModelVersion();
}
public String getId()
{
- return getInterpolatedModel().getId();
+ return getModel().getId();
}
public void setGroupId( String groupId )
@@ -275,7 +275,7 @@
public String getGroupId()
{
- return getInterpolatedModel().getGroupId();
+ return getModel().getGroupId();
}
public void setArtifactId( String artifactId )
@@ -285,7 +285,7 @@
public String getArtifactId()
{
- return getInterpolatedModel().getArtifactId();
+ return getModel().getArtifactId();
}
public void setName( String name )
@@ -295,7 +295,7 @@
public String getName()
{
- return getInterpolatedModel().getName();
+ return getModel().getName();
}
public void setVersion( String version )
@@ -305,7 +305,7 @@
public String getVersion()
{
- return getInterpolatedModel().getVersion();
+ return getModel().getVersion();
}
public void setInceptionYear( String inceptionYear )
@@ -315,7 +315,7 @@
public String getInceptionYear()
{
- return getInterpolatedModel().getInceptionYear();
+ return getModel().getInceptionYear();
}
public void setPackage( String packageName )
@@ -325,7 +325,7 @@
public String getPackage()
{
- return getInterpolatedModel().getPackage();
+ return getModel().getPackage();
}
public void setUrl( String url )
@@ -335,7 +335,7 @@
public String getUrl()
{
- return getInterpolatedModel().getUrl();
+ return getModel().getUrl();
}
public void setIssueTrackingUrl( String issueTrackingUrl )
@@ -345,7 +345,7 @@
public String getIssueTrackingUrl()
{
- return getInterpolatedModel().getIssueTrackingUrl();
+ return getModel().getIssueTrackingUrl();
}
public void setSiteAddress( String siteAddress )
@@ -355,7 +355,7 @@
public String getSiteAddress()
{
- return getInterpolatedModel().getSiteAddress();
+ return getModel().getSiteAddress();
}
public void setSiteDirectory( String siteDirectory )
@@ -365,7 +365,7 @@
public String getSiteDirectory()
{
- return getInterpolatedModel().getSiteDirectory();
+ return getModel().getSiteDirectory();
}
public void setDistributionDirectory( String distributionDirectory )
@@ -375,7 +375,7 @@
public String getDistributionDirectory()
{
- return getInterpolatedModel().getDistributionDirectory();
+ return getModel().getDistributionDirectory();
}
public void setShortDescription( String shortDescription )
@@ -385,7 +385,7 @@
public String getShortDescription()
{
- return getInterpolatedModel().getShortDescription();
+ return getModel().getShortDescription();
}
public void setDescription( String description )
@@ -395,7 +395,7 @@
public String getDescription()
{
- return getInterpolatedModel().getDescription();
+ return getModel().getDescription();
}
public void setOrganization( Organization organization )
@@ -405,7 +405,7 @@
public Organization getOrganization()
{
- return getInterpolatedModel().getOrganization();
+ return getModel().getOrganization();
}
public void setRepository( Repository repository )
@@ -415,7 +415,7 @@
public Repository getRepository()
{
- return getInterpolatedModel().getRepository();
+ return getModel().getRepository();
}
public void setMailingLists( List mailingLists )
@@ -425,7 +425,7 @@
public List getMailingLists()
{
- return getInterpolatedModel().getMailingLists();
+ return getModel().getMailingLists();
}
public void addMailingList( MailingList mailingList )
@@ -440,7 +440,7 @@
public List getVersions()
{
- return getInterpolatedModel().getVersions();
+ return getModel().getVersions();
}
public void addVersion( Version version )
@@ -455,7 +455,7 @@
public List getBranches()
{
- return getInterpolatedModel().getBranches();
+ return getModel().getBranches();
}
public void addBranches( Branch branch )
@@ -470,7 +470,7 @@
public List getDevelopers()
{
- return getInterpolatedModel().getDevelopers();
+ return getModel().getDevelopers();
}
public void addDeveloper( Developer developer )
@@ -485,7 +485,7 @@
public List getContributors()
{
- return getInterpolatedModel().getContributors();
+ return getModel().getContributors();
}
public void addContributor( Contributor contributor )
@@ -500,7 +500,7 @@
public Build getBuild()
{
- return getInterpolatedModel().getBuild();
+ return getModel().getBuild();
}
public void setReports( List reports )
@@ -510,7 +510,7 @@
public List getReports()
{
- return getInterpolatedModel().getReports();
+ return getModel().getReports();
}
public void addReports( String report )
@@ -525,7 +525,7 @@
public List getLicenses()
{
- return getInterpolatedModel().getLicenses();
+ return getModel().getLicenses();
}
public void addLicense( License license )
@@ -559,12 +559,6 @@
if ( property == null && hasParent() )
{
- System.out.println( "key = " + key );
-
- System.out.println( "getParent() = " + getParent() );
-
- System.out.println( "getParent().getId() = " + getParent().getId() );
-
property = getParent().getProperty( key );
}
1.17 +14 -0 maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultProjectBuilderTest.java 10 Dec 2003 05:09:10 -0000 1.16
+++ DefaultProjectBuilderTest.java 10 Dec 2003 05:37:36 -0000 1.17
@@ -1,6 +1,7 @@
package org.apache.maven.project;
import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.model.Dependency;
import java.io.File;
@@ -164,6 +165,19 @@
assertNotNull( project.getParent().getParent() );
+ // Get version which is set in both the parent and the grand parent. So
+ // we should get "2.0" which is definted in this project.
assertEquals( "2.0", project.getVersion() );
+
+ // There are no dependencies specified in this project but there are
+ // dependencies specified in the parent.
+ Dependency d0 = (Dependency) project.getDependencies().get( 0 );
+
+ assertNotNull( "Dependency which has been specified in the parent cannot be null", d0 );
+
+ assertEquals( "b", d0.getGroupId() );
+
+ // Get the inception year from the grand parent.
+ assertEquals( "2001", project.getInceptionYear() );
}
}
1.2 +2 -2 maven-components/maven-project/src/test/org/apache/maven/project/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/ProjectTestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectTestHelper.java 9 Dec 2003 15:34:40 -0000 1.1
+++ ProjectTestHelper.java 10 Dec 2003 05:37:37 -0000 1.2
@@ -12,7 +12,7 @@
/**
*
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*
* @version $Id$
1.3 +0 -1 maven-components/maven-project/src/test-input/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test-input/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 10 Dec 2003 05:09:10 -0000 1.2
+++ project.xml 10 Dec 2003 05:37:37 -0000 1.3
@@ -12,7 +12,6 @@
<package>org.apache.maven</package>
<logo>/images/maven.jpg</logo>
- <gumpRepositoryId/>
<description/>
<shortDescription/>
<url/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org