werken 2002/06/03 10:13:16
Modified: . project.xml
src/dvsl/xdocs site.dvsl
src/java/org/apache/maven/project Project.java
src/templates/xdocs project-info.xml
src/test/org/apache/maven/project ProjectMapperTest.java
xdocs/ref dirlayout.xml
Added: src/java/org/apache/maven/project Contributor.java
src/templates/xdocs team-list.xml
Removed: src/templates/xdocs developer-list.xml
Log:
Added <contributors>/<contributor> tags to the POM to allow inclusion
of folks who've contributed, but don't necessarily have commit access
to the repository. Differentiating between 'members' and 'contributors'
now.
Revision Changes Path
1.94 +16 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- project.xml 3 Jun 2002 04:01:29 -0000 1.93
+++ project.xml 3 Jun 2002 17:13:16 -0000 1.94
@@ -205,9 +205,24 @@
<organization>SOMA Networks, Inc.</organization>
</developer>
- </developers>
+ <developer>
+ <name>Bob McWhirter</name>
+ <id>werken</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>The Werken Company</organization>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Nathan Coast</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
+ <contributor>
+ <name>Peter Lynch</name>
+ </contributor>
+ </contributors>
<!-- Need to mark these as compile-time/run-time -->
<dependencies>
1.47 +2 -2 jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- site.dvsl 2 Jun 2002 14:20:54 -0000 1.46
+++ site.dvsl 3 Jun 2002 17:13:16 -0000 1.47
@@ -174,9 +174,9 @@
<div><small><a href="$relativePath/index.html">Front
Page</a></small></div>
<div>
<small><a href="$relativePath/project-info.html">Project
Info</a></small>
- #if ($currentDir == "." && ($infilename == "project-info.xml" ||
$infilename == "mail-lists.xml" || $infilename == "developer-list.xml" || $infilename
== "dependencies.xml"))
+ #if ($currentDir == "." && ($infilename == "project-info.xml" ||
$infilename == "mail-lists.xml" || $infilename == "team-list.xml" || $infilename ==
"dependencies.xml"))
<div><small><a href="$relativePath/mail-lists.html">Mailing
Lists</a></small></div>
- <div><small><a
href="$relativePath/developer-list.html">Developers</a></small></div>
+ <div><small><a href="$relativePath/team-list.html">Project
Team</a></small></div>
<div><small><a
href="$relativePath/dependencies.html">Dependencies</a></small></div>
#if ($pom.repository.url)
<div><small><a
href="$pom.repository.url.toString().trim()">Source Repository</a></small></div>
1.23 +27 -1
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Project.java 2 Jun 2002 17:16:02 -0000 1.22
+++ Project.java 3 Jun 2002 17:13:16 -0000 1.23
@@ -65,7 +65,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: Project.java,v 1.22 2002/06/02 17:16:02 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.23 2002/06/03 17:13:16 werken Exp $
*/
public class Project
extends BaseObject
@@ -111,6 +111,11 @@
private List developers;
/**
+ * Project's (non-committing) contributors.
+ */
+ private List contributors;
+
+ /**
* Current version
*/
private String currentVersion;
@@ -171,6 +176,7 @@
dependencies = new ArrayList();
mailingLists = new ArrayList();
developers = new ArrayList();
+ contributors = new ArrayList();
versions = new ArrayList();
//distributionMap = new HashMap();
}
@@ -309,6 +315,26 @@
public List getDevelopers()
{
return developers;
+ }
+
+ /**
+ * Add a contributor to this project.
+ *
+ * @param contributor Contributor for this project.
+ */
+ public void addContributor(Contributor contributor)
+ {
+ contributors.add(contributor);
+ }
+
+ /**
+ * Return the contributors for this project.
+ *
+ * @return List of contributors.
+ */
+ public List getContributors()
+ {
+ return contributors;
}
/**
1.1
jakarta-turbine-maven/src/java/org/apache/maven/project/Contributor.java
Index: Contributor.java
===================================================================
package org.apache.maven.project;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Maven" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Maven", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
* @version $Id: Contributor.java,v 1.1 2002/06/03 17:13:16 werken Exp $
*/
public class Contributor
extends BaseObject
{
/**
* Contributor's email address. NOTE: there may eventually be more than
* one email address.
*/
private String email;
/**
* Contributor's organziation.
*/
private String organization;
/**
* Constructor for the Developer object
*/
public Contributor()
{
}
/**
* Sets the email attribute of the Developer object
*/
public void setEmail(String email)
{
this.email = email;
}
/**
* Gets the email attribute of the Developer object
*/
public String getEmail()
{
return email;
}
/**
* Sets the organization attribute of the Developer object
*/
public void setOrganization(String organization)
{
this.organization = organization;
}
/**
* Gets the organization attribute of the Developer object
*/
public String getOrganization()
{
return organization;
}
}
1.6 +2 -2 jakarta-turbine-maven/src/templates/xdocs/project-info.xml
Index: project-info.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/xdocs/project-info.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project-info.xml 3 Jun 2002 10:20:28 -0000 1.5
+++ project-info.xml 3 Jun 2002 17:13:16 -0000 1.6
@@ -25,9 +25,9 @@
information for this project's mailing lists.
</td>
</tr>
- <tr><td><a href="developer-list.html">Developers</a></td>
+ <tr><td><a href="team-list.html">Project Team</a></td>
<td>
- This document provides information on the developers of
+ This document provides information on the members of
this project. These are the individuals who have
contributed to the project in one form or another.
</td>
1.1 jakarta-turbine-maven/src/templates/xdocs/team-list.xml
Index: team-list.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Project Team</title>
</properties>
<body>
<section name="The Team">
<p>
A successful project requires many people to play many roles.
Some members write code or documentation, while others are
valuable as testers, submitting patches and suggestions.
</p>
<p>
The team is comprised of <a href="#Members">Members</a>
and <a href="#Contributors">Contributors</a>. Members
have direct access to the source of a project and actively
evolve the code-base. Contributors improve the project
through submission of patches and suggestions to the Members.
The number of Contributors to the project is unbounded.
Get involved today. All contributions to the project are
greatly appreciated.
</p>
</section>
<section name="Members">
#if ($project.developers.size() == 0)
<p>
There are no developers working on this project. Please check
back at a later date.
</p>
#else
<p>
The following is a list of developers with commit priviledges that have
directly contributed to the project in one way or another.
</p>
<table>
<tr>
<th>Name</th>
<th>Email</th>
<th>Organization</th>
</tr>
#foreach ($developer in $project.developers)
<tr>
<td>$!developer.name</td>
<td><a href="mailto:$!developer.email";>$!developer.email</a></td>
<td>$!developer.organization</td>
</tr>
#end
</table>
#end
#if ($project.contributors.size() != 0 )
<section name="Contributors">
<p>
The following additional people have contributed to this project
through the way of suggestions, patches or documentation.
</p>
<table>
<tr>
<th>Name</th>
<th>Email</th>
<th>Organization</th>
</tr>
#foreach ($contributor in $project.contributors)
<tr>
<td>$!contributor.name</td>
<td><a href="mailto:$!contributor.email";>$!contributor.email</a></td>
<td>$!contributor.organization</td>
</tr>
#end
</table>
</section>
#end
</section>
</body>
</document>
1.21 +6 -0
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
Index: ProjectMapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ProjectMapperTest.java 1 Jun 2002 23:32:00 -0000 1.20
+++ ProjectMapperTest.java 3 Jun 2002 17:13:16 -0000 1.21
@@ -124,6 +124,12 @@
assertEquals("[EMAIL PROTECTED]",
((Developer)p.getDevelopers().get(0)).getEmail());
+ // Test Contributor List info
+ assertEquals("Nathan Coast",
+ ((Contributor)p.getContributors().get(0)).getName());
+ assertEquals("[EMAIL PROTECTED]",
+ ((Contributor)p.getContributors().get(0)).getEmail());
+
// Test Dependencies
assertEquals("dom4j",
((Dependency)p.getDependencies().get(0)).getId());
1.4 +3 -3 jakarta-turbine-maven/xdocs/ref/dirlayout.xml
Index: dirlayout.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/dirlayout.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dirlayout.xml 9 May 2002 04:19:59 -0000 1.3
+++ dirlayout.xml 3 Jun 2002 17:13:16 -0000 1.4
@@ -317,10 +317,10 @@
</td>
</tr>
<tr>
- <td>docs/developer-list.html</td>
- <td>The list of developers.</td>
+ <td>docs/member-list.html</td>
+ <td>The list of project members.</td>
<td>
- Maven automatically generates a list of developers based
+ Maven automatically generates a list of project members based
on the information provided in the <a
href="project-descriptor.html#developers">project
descriptor</a>.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
