You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ks...@apache.org on 2002/12/05 16:55:36 UTC
cvs commit: jakarta-turbine-maven/xdocs/reference project-descriptor.xml
kschrader 2002/12/05 07:55:36
Modified: . project.xml
src/java/org/apache/maven/project Contributor.java
src/plugins-build/xdoc/templates team-list.xml
src/test/java/org/apache/maven/project ContributorTest.java
src/xsd maven-project.xsd
xdocs/reference project-descriptor.xml
Log:
Adding in a <url/> tag to <developer/> so we can all point to our
homepages from the team-list.html page.
Revision Changes Path
1.219 +3 -2 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- project.xml 29 Nov 2002 23:58:50 -0000 1.218
+++ project.xml 5 Dec 2002 15:55:35 -0000 1.219
@@ -224,10 +224,10 @@
</developer>
<developer>
- <name>St�phane Mor</name>
+ <name>St?phane Mor</name>
<id>smor</id>
<email>stephanemor@yahoo.fr</email>
- <organization>Hasgard Syst�mes et R�seaux</organization>
+ <organization>Hasgard Syst?mes et R?seaux</organization>
<roles>
<role>Java Developer</role>
</roles>
@@ -248,6 +248,7 @@
<id>kschrader</id>
<email>kschrader@karmalab.org</email>
<organization>University of Michigan</organization>
+ <url>http://karmalab.org/~kschrader/</url>
<roles>
<role>Java Developer</role>
</roles>
1.4 +29 -1 jakarta-turbine-maven/src/java/org/apache/maven/project/Contributor.java
Index: Contributor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Contributor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Contributor.java 24 Nov 2002 19:00:39 -0000 1.3
+++ Contributor.java 5 Dec 2002 15:55:35 -0000 1.4
@@ -66,6 +66,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
* @author <a href="mailto:glenn@somanetworks.com">Glenn McAllister</a>
+ * @author <a href="mailto:kschrader@karmalab.org">Kurt Schrader</a>
* @version $Id$
*/
public class Contributor
@@ -88,6 +89,11 @@
private SortedSet roles = new TreeSet();
/**
+ * Contributor's homepage URL
+ */
+ private String url;
+
+ /**
* Constructor for the Contributor object
*/
public Contributor()
@@ -152,5 +158,27 @@
public SortedSet getRoles()
{
return roles;
+ }
+
+ /**
+ * Gets the homepage url of the Contributor object.
+ *
+ * @return the URL of the Contributor's homepage
+ */
+
+ public String getUrl()
+ {
+ return url;
+ }
+
+ /**
+ * Set the url attribute of the Contributor object
+ *
+ * @param url the Contributor's homepage URL
+ */
+
+ public void setUrl(String url)
+ {
+ this.url = url;
}
}
1.4 +4 -0 jakarta-turbine-maven/src/plugins-build/xdoc/templates/team-list.xml
Index: team-list.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/templates/team-list.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- team-list.xml 24 Sep 2002 16:57:54 -0000 1.3
+++ team-list.xml 5 Dec 2002 15:55:35 -0000 1.4
@@ -47,7 +47,11 @@
</tr>
#foreach ($developer in $project.developers)
<tr>
+ #if ($developer.url.length() != 0)
+ <td><a href="$developer.url">$!developer.name</a></td>
+ #else
<td>$!developer.name</td>
+ #end
<td><a name="$!developer.id">$!developer.id</a></td>
<td><a href="mailto:$!developer.email">$!developer.email</a></td>
<td>$!developer.organization</td>
1.2 +15 -2 jakarta-turbine-maven/src/test/java/org/apache/maven/project/ContributorTest.java
Index: ContributorTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/ContributorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContributorTest.java 26 Nov 2002 23:37:30 -0000 1.1
+++ ContributorTest.java 5 Dec 2002 15:55:35 -0000 1.2
@@ -55,7 +55,7 @@
public void testSetGetEmail() throws Exception
{
// JUnitDoclet begin method setEmail getEmail
- java.lang.String[] tests = {"", " ", "a", "A", "�", "�", "0123456789", "012345678901234567890", "\n", null};
+ java.lang.String[] tests = {"", " ", "a", "A", "?", "?", "0123456789", "012345678901234567890", "\n", null};
for ( int i = 0; i < tests.length; i++ )
{
@@ -68,7 +68,7 @@
public void testSetGetOrganization() throws Exception
{
// JUnitDoclet begin method setOrganization getOrganization
- java.lang.String[] tests = {"", " ", "a", "A", "�", "�", "0123456789", "012345678901234567890", "\n", null};
+ java.lang.String[] tests = {"", " ", "a", "A", "?", "?", "0123456789", "012345678901234567890", "\n", null};
for ( int i = 0; i < tests.length; i++ )
{
@@ -76,6 +76,19 @@
assertEquals( tests[i], contributor.getOrganization() );
}
// JUnitDoclet end method setOrganization getOrganization
+ }
+
+ public void testSetGetUrl() throws Exception
+ {
+ // JUnitDoclet begin method setUrl getUrl
+ java.lang.String[] tests = {"", " ", "a", "A", "?", "?", "0123456789", "012345678901234567890", "\n", null};
+
+ for ( int i = 0; i < tests.length; i++ )
+ {
+ contributor.setUrl( tests[i] );
+ assertEquals( tests[i], contributor.getUrl() );
+ }
+ // JUnitDoclet end method setUrl getUrl
}
public void testAddRole() throws Exception
1.12 +1 -0 jakarta-turbine-maven/src/xsd/maven-project.xsd
Index: maven-project.xsd
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/xsd/maven-project.xsd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven-project.xsd 14 Nov 2002 17:46:25 -0000 1.11
+++ maven-project.xsd 5 Dec 2002 15:55:35 -0000 1.12
@@ -146,6 +146,7 @@
<xs:element ref="email"/>
<xs:element name="organization" type='xs:string' minOccurs="0"/>
<xs:element ref="roles"/>
+ <xs:element ref="url"/>
</xs:sequence>
</xs:complexType>
</xs:element>
1.6 +4 -0 jakarta-turbine-maven/xdocs/reference/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/reference/project-descriptor.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project-descriptor.xml 1 Oct 2002 16:53:36 -0000 1.5
+++ project-descriptor.xml 5 Dec 2002 15:55:36 -0000 1.6
@@ -406,6 +406,10 @@
<td>The organization to which the developer belongs.</td>
</tr>
<tr>
+ <td>url</td>
+ <td>The URL for the homepage of the developer</td>
+ </tr>
+ <tr>
<td>roles</td>
<td>
The roles the developer plays in the project. Each role is
Re: cvs commit: jakarta-turbine-maven/xdocs/reference project-descriptor.xml
Posted by Martin Poeschl <mp...@marmot.at>.
Kurt Schrader wrote:
>On 5 Dec 2002 kschrader@apache.org wrote:
>
>
>
>> - <name>St?phane Mor</name>
>> + <name>St?phane Mor</name>
>> <id>smor</id>
>> <email>stephanemor@yahoo.fr</email>
>> - <organization>Hasgard Syst?mes et R?seaux</organization>
>> + <organization>Hasgard Syst?mes et R?seaux</organization>
>>
>>
>
>Damn. Anybody know how I can keep this from happening?
>I edit in IDEA under Linux, if that makes a difference.
>
i don't know IDEA but sometimes i have the same problem using jbuilder :-(
martin
Re: cvs commit: jakarta-turbine-maven/xdocs/reference project-descriptor.xml
Posted by Kurt Schrader <ks...@karmalab.org>.
On 5 Dec 2002 kschrader@apache.org wrote:
> - <name>St�phane Mor</name>
> + <name>St?phane Mor</name>
> <id>smor</id>
> <email>stephanemor@yahoo.fr</email>
> - <organization>Hasgard Syst�mes et R�seaux</organization>
> + <organization>Hasgard Syst?mes et R?seaux</organization>
Damn. Anybody know how I can keep this from happening?
I edit in IDEA under Linux, if that makes a difference.
-Kurt