jvanzyl 2004/04/17 08:14:18
Modified: maven-project/src/main/java/org/apache/maven/project
DefaultModelInheritanceAssembler.java
MavenProject.java
maven-project/src/test/java/org/apache/maven/project/helpers
ModelTestHelper.java ProjectTestHelper.java
maven-project/src/test/resources/projects
fully-populated-child.xml project.xml
maven-project/src/test/resources/projects/base-directory-alignment
project-which-needs-directory-alignment.xml
Log:
o we are externalizing the version/branch elements. POMs will be search
in order to find the required version/tag(branch).
Revision Changes Path
1.3 +4 -16
maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultModelInheritanceAssembler.java 13 Apr 2004 03:19:31 -0000 1.2
+++ DefaultModelInheritanceAssembler.java 17 Apr 2004 15:14:17 -0000 1.3
@@ -77,10 +77,10 @@
child.setDistributionDirectory( parent.getDistributionDirectory() );
}
- // issueTrackingUrl
- if ( child.getIssueTrackingUrl() == null )
+ // issueManagement
+ if ( child.getIssueManagement() == null )
{
- child.setIssueTrackingUrl( parent.getIssueTrackingUrl() );
+ child.setIssueManagement( parent.getIssueManagement() );
}
// Short description
@@ -123,18 +123,6 @@
if ( child.getMailingLists().size() == 0 )
{
child.setMailingLists( parent.getMailingLists() );
- }
-
- // versions
- if ( child.getVersions().size() == 0 )
- {
- child.setVersions( parent.getVersions() );
- }
-
- // branches
- if ( child.getBranches().size() == 0 )
- {
- child.setBranches( parent.getBranches() );
}
// dependencies
1.4 +6 -59
maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MavenProject.java 13 Apr 2004 03:19:31 -0000 1.3
+++ MavenProject.java 17 Apr 2004 15:14:17 -0000 1.4
@@ -17,18 +17,17 @@
*/
import org.apache.maven.artifact.MavenArtifact;
-import org.apache.maven.model.Branch;
import org.apache.maven.model.Build;
import org.apache.maven.model.Contributor;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Developer;
+import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.License;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
-import org.apache.maven.model.Version;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -150,7 +149,6 @@
public void initialize()
{
- createVersionMap();
}
// ----------------------------------------------------------------------
@@ -163,27 +161,6 @@
}
// ----------------------------------------------------------------------
- // Version Support
- // ----------------------------------------------------------------------
-
- private Map versionMap = new HashMap();
-
- private void createVersionMap()
- {
- for ( Iterator i = getVersions().iterator(); i.hasNext(); )
- {
- Version version = (Version) i.next();
-
- versionMap.put( version.getId(), version );
- }
- }
-
- public Version getVersionById( String versionId )
- {
- return (Version) versionMap.get( versionId );
- }
-
- // ----------------------------------------------------------------------
// Dependency Support
// ----------------------------------------------------------------------
@@ -484,14 +461,14 @@
return getModel().getLogo();
}
- public void setIssueTrackingUrl( String issueTrackingUrl )
+ public void setIssueManagement( IssueManagement issueManagement )
{
- getModel().setIssueTrackingUrl( issueTrackingUrl );
+ getModel().setIssueManagement( issueManagement );
}
- public String getIssueTrackingUrl()
+ public IssueManagement getIssueManagement()
{
- return getModel().getIssueTrackingUrl();
+ return getModel().getIssueManagement();
}
public void setSiteAddress( String siteAddress )
@@ -577,36 +554,6 @@
public void addMailingList( MailingList mailingList )
{
getModel().addMailingList( mailingList );
- }
-
- public void setVersions( List versions )
- {
- getModel().setVersions( versions );
- }
-
- public List getVersions()
- {
- return getModel().getVersions();
- }
-
- public void addVersion( Version version )
- {
- getModel().addVersion( version );
- }
-
- public void setBranches( List branches )
- {
- getModel().setBranches( branches );
- }
-
- public List getBranches()
- {
- return getModel().getBranches();
- }
-
- public void addBranches( Branch branch )
- {
- getModel().addBranch( branch );
}
public void setDevelopers( List developers )
1.4 +1 -18
maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ModelTestHelper.java
Index: ModelTestHelper.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ModelTestHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModelTestHelper.java 13 Apr 2004 03:19:31 -0000 1.3
+++ ModelTestHelper.java 17 Apr 2004 15:14:17 -0000 1.4
@@ -17,7 +17,6 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.Version;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Contributor;
@@ -62,8 +61,6 @@
assertEquals( "http://maven.apache.org/";, model.getUrl() );
- assertEquals( "issueTrackingUrl", model.getIssueTrackingUrl() );
-
assertEquals( "maven.apache.org", model.getSiteAddress() );
assertEquals( "/www/maven.apache.org/", model.getSiteDirectory() );
@@ -91,18 +88,6 @@
assertEquals( "repository-url", model.getScm().getUrl() );
// ----------------------------------------------------------------------
- // Versions
- // ----------------------------------------------------------------------
-
- Version v = (Version) model.getVersions().get( 0 );
-
- assertEquals( "b1", v.getId() );
-
- assertEquals( "1.0-b1", v.getName() );
-
- assertEquals( "MAVEN_1_0_B1", v.getTag() );
-
- // ----------------------------------------------------------------------
// MailingLists
// ----------------------------------------------------------------------
@@ -171,8 +156,6 @@
// ----------------------------------------------------------------------
Build build = model.getBuild();
-
- assertEquals( "[EMAIL PROTECTED]", build.getNagEmailAddress() );
assertEquals( "/sourceDirectory", build.getSourceDirectory() );
1.4 +1 -18
maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectTestHelper.java 13 Apr 2004 03:19:31 -0000 1.3
+++ ProjectTestHelper.java 17 Apr 2004 15:14:17 -0000 1.4
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.model.Version;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Contributor;
@@ -62,8 +61,6 @@
assertEquals( "http://maven.apache.org/";, project.getUrl() );
- assertEquals( "issueTrackingUrl", project.getIssueTrackingUrl() );
-
assertEquals( "maven.apache.org", project.getSiteAddress() );
assertEquals( "/www/maven.apache.org/", project.getSiteDirectory() );
@@ -91,18 +88,6 @@
assertEquals( "repository-url", project.getScm().getUrl() );
// ----------------------------------------------------------------------
- // Versions
- // ----------------------------------------------------------------------
-
- Version v = (Version) project.getVersions().get( 0 );
-
- assertEquals( "b1", v.getId() );
-
- assertEquals( "1.0-b1", v.getName() );
-
- assertEquals( "MAVEN_1_0_B1", v.getTag() );
-
- // ----------------------------------------------------------------------
// MailingLists
// ----------------------------------------------------------------------
@@ -171,8 +156,6 @@
// ----------------------------------------------------------------------
Build build = project.getBuild();
-
- assertEquals( "[EMAIL PROTECTED]", build.getNagEmailAddress() );
assertEquals( "/sourceDirectory", build.getSourceDirectory() );
1.2 +0 -14
maven-components/maven-project/src/test/resources/projects/fully-populated-child.xml
Index: fully-populated-child.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/resources/projects/fully-populated-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fully-populated-child.xml 16 Apr 2004 17:56:37 -0000 1.1
+++ fully-populated-child.xml 17 Apr 2004 15:14:17 -0000 1.2
@@ -34,20 +34,6 @@
<url>repository-url</url>
</scm>
- <versions>
- <version>
- <id>b1</id>
- <name>1.0-b1</name>
- <tag>MAVEN_1_0_B1</tag>
- </version>
- </versions>
-
- <branches>
- <branch>
- <tag>tag</tag>
- </branch>
- </branches>
-
<mailingLists>
<mailingList>
<name>Maven User List</name>
1.2 +0 -14
maven-components/maven-project/src/test/resources/projects/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/resources/projects/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 16 Apr 2004 17:56:37 -0000 1.1
+++ project.xml 17 Apr 2004 15:14:17 -0000 1.2
@@ -28,20 +28,6 @@
<url>repository-url</url>
</scm>
- <versions>
- <version>
- <id>b1</id>
- <name>1.0-b1</name>
- <tag>MAVEN_1_0_B1</tag>
- </version>
- </versions>
-
- <branches>
- <branch>
- <tag>tag</tag>
- </branch>
- </branches>
-
<mailingLists>
<mailingList>
<name>Maven User List</name>
1.2 +0 -14
maven-components/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
Index: project-which-needs-directory-alignment.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-which-needs-directory-alignment.xml 16 Apr 2004 17:56:37 -0000
1.1
+++ project-which-needs-directory-alignment.xml 17 Apr 2004 15:14:18 -0000
1.2
@@ -28,20 +28,6 @@
<url>repository-url</url>
</repository>
- <versions>
- <version>
- <id>b1</id>
- <name>1.0-b1</name>
- <tag>MAVEN_1_0_B1</tag>
- </version>
- </versions>
-
- <branches>
- <branch>
- <tag>tag</tag>
- </branch>
- </branches>
-
<mailingLists>
<mailingList>
<name>Maven User List</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
