Author: vsiveton
Date: Fri Dec 10 10:48:47 2010
New Revision: 1044279
URL: http://svn.apache.org/viewvc?rev=1044279&view=rev
Log:
MDOAP-28:Remove developers/contributors having role 'emeritus'
Submitted by: Felix Knecht
Reviewed by: Vincent Siveton
o patch applied
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
maven/plugins/trunk/maven-doap-plugin/src/main/resources/doap-person.properties
maven/plugins/trunk/maven-doap-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapUtilTest.java
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java?rev=1044279&r1=1044278&r2=1044279&view=diff
==============================================================================
---
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
Fri Dec 10 10:48:47 2010
@@ -347,6 +347,10 @@ public class DoapUtil
{
( (List) returnMap.get( "helpers" ) ).add( obj );
}
+ else if ( role.indexOf( getLowerCaseString( i18n,
"doap.emeritus" ) ) != -1 )
+ {
+ // Don't add as developer nor as contributor as the
person is no longer involved
+ }
else
{
( (List) returnMap.get( "unknowns" ) ).add( obj );
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/resources/doap-person.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/resources/doap-person.properties?rev=1044279&r1=1044278&r2=1044279&view=diff
==============================================================================
---
maven/plugins/trunk/maven-doap-plugin/src/main/resources/doap-person.properties
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/main/resources/doap-person.properties
Fri Dec 10 10:48:47 2010
@@ -20,4 +20,5 @@ doap.developer=developer
doap.documenter=documenter
doap.translator=translator
doap.tester=tester
-doap.helper=helper
\ No newline at end of file
+doap.helper=helper
+doap.emeritus=emeritus
Modified: maven/plugins/trunk/maven-doap-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/site/fml/faq.fml?rev=1044279&r1=1044278&r2=1044279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/site/fml/faq.fml Fri Dec 10
10:48:47 2010
@@ -61,5 +61,12 @@ under the License.
href="./examples/doap-in-use.html">DOAP in Use</a> part.</p>
</answer>
</faq>
+ <faq id="Why are not all developers/contributors listed in the DOAP file
as maintainer">
+ <question>Why are not all developers/contributors listed in the DOAP
file as maintainer?</question>
+ <answer>
+ <p>Developers/contributors having a role containing "<i>emeritus</i>"
are no longer active in the
+ project and can't be maintainers therefore.</p>
+ </answer>
+ </faq>
</part>
</faqs>
Modified:
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapUtilTest.java?rev=1044279&r1=1044278&r2=1044279&view=diff
==============================================================================
---
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapUtilTest.java
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapUtilTest.java
Fri Dec 10 10:48:47 2010
@@ -170,6 +170,22 @@ public class DoapUtilTest
assertFalse( DoapUtil.getDevelopersOrContributorsWithTesterRole( i18n,
developersOrContributors ).isEmpty() );
assertTrue( DoapUtil.getDevelopersOrContributorsWithTranslatorRole(
i18n, developersOrContributors ).isEmpty() );
assertFalse( DoapUtil.getDevelopersOrContributorsWithUnknownRole(
i18n, developersOrContributors ).isEmpty() );
+
+ // Skip emeritus role
+ developersOrContributors.clear();
+
+ dev = new Developer();
+ dev.setId( "dev1" );
+ dev.addRole( "maintainer" );
+ dev.addRole( "unknown" );
+
+ developersOrContributors.add( dev );
+
+ int sizeBeforeEmeritus =
DoapUtil.getDevelopersOrContributorsWithUnknownRole( i18n,
developersOrContributors).size();
+ dev.addRole( " Emeritus" );
+
+ assertTrue( DoapUtil.getDevelopersOrContributorsWithUnknownRole( i18n,
developersOrContributors).size() == sizeBeforeEmeritus );
+
}
/**
