You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2010/12/09 23:36:41 UTC
svn commit: r1044153 - in /maven/plugins/trunk/maven-doap-plugin/src:
main/java/org/apache/maven/plugin/doap/DoapMojo.java
test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
Author: vsiveton
Date: Thu Dec 9 22:36:40 2010
New Revision: 1044153
URL: http://svn.apache.org/viewvc?rev=1044153&view=rev
Log:
MDOAP-24: programing-language, os and name properties should be an RDF literals, not a RDF resources.
Submitted by: Tim Fliss
Reviewed by: Vincent Siveton
o patch applied
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1044153&r1=1044152&r2=1044153&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Thu Dec 9 22:36:40 2010
@@ -441,11 +441,11 @@ public class DoapMojo
if ( asfExtOptions.isIncluded()
&& !project.getName().toLowerCase( Locale.ENGLISH ).trim().startsWith( "apache" ) )
{
- DoapUtil.writeRdfResourceElement( writer, "name", "Apache " + project.getName() );
+ DoapUtil.writeElement( writer, "name", "Apache " + project.getName() );
}
else
{
- DoapUtil.writeRdfResourceElement( writer, "name", project.getName() );
+ DoapUtil.writeElement( writer, "name", project.getName() );
}
}
@@ -549,7 +549,7 @@ public class DoapMojo
+ "Refer you to http://projects.apache.org/languages.html" );
}
- DoapUtil.writeRdfResourceElement( writer, "programming-language", language );
+ DoapUtil.writeElement( writer, "programming-language", language );
}
if ( StringUtils.isNotEmpty( doapOptions.getProgrammingLanguage() ) )
@@ -565,7 +565,7 @@ public class DoapMojo
+ "Refer you to http://projects.apache.org/languages.html" );
}
- DoapUtil.writeRdfResourceElement( writer, "programming-language", languages[i].trim() );
+ DoapUtil.writeElement( writer, "programming-language", languages[i].trim() );
}
}
}
@@ -687,7 +687,7 @@ public class DoapMojo
String[] oses = StringUtils.split( doapOptions.getOs(), "," );
for ( int i = 0; i < oses.length; i++ )
{
- DoapUtil.writeRdfResourceElement( writer, "os", oses[i].trim() );
+ DoapUtil.writeElement( writer, "os", oses[i].trim() );
}
}
@@ -1366,7 +1366,7 @@ public class DoapMojo
// asfext:name
if ( StringUtils.isNotEmpty( asfExtOptions.getName() ) )
{
- DoapUtil.writeRdfResourceElement( writer, "asfext:name", asfExtOptions.getName() );
+ DoapUtil.writeElement( writer, "asfext:name", asfExtOptions.getName() );
}
else
{
@@ -1381,11 +1381,11 @@ public class DoapMojo
// Respect ASF rule
if ( !project.getName().trim().startsWith( "Apache" ) )
{
- DoapUtil.writeRdfResourceElement( writer, "asfext:name", "Apache " + project.getName().trim() );
+ DoapUtil.writeElement( writer, "asfext:name", "Apache " + project.getName().trim() );
}
else
{
- DoapUtil.writeRdfResourceElement( writer, "asfext:name", project.getName().trim() );
+ DoapUtil.writeElement( writer, "asfext:name", project.getName().trim() );
}
}
}
Modified: maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java?rev=1044153&r1=1044152&r2=1044153&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java Thu Dec 9 22:36:40 2010
@@ -95,12 +95,12 @@ public class DoapMojoTest
assertTrue( readed.indexOf( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) != -1 );
assertTrue( readed.indexOf( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 );
}
- assertTrue( readed.indexOf( "<name rdf:resource=\"" + mavenProject.getName() + "\"/>" ) != -1 );
- assertTrue( readed.indexOf( "<programming-language rdf:resource=\"java\"/>" ) != -1 );
+ assertTrue( readed.indexOf( "<name>" + mavenProject.getName() + "</name>" ) != -1 );
+ assertTrue( readed.indexOf( "<programming-language>java</programming-language>" ) != -1 );
// ASF ext
assertFalse( readed.indexOf( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 );
- assertFalse( readed.indexOf( "<asfext:name rdf:resource=\"" + mavenProject.getName() + "\"/>" ) != -1 );
+ assertFalse( readed.indexOf( "<asfext:name>" + mavenProject.getName() + "</name>" ) != -1 );
}
/**
@@ -144,12 +144,12 @@ public class DoapMojoTest
assertTrue( readed.indexOf( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) != -1 );
assertTrue( readed.indexOf( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 );
}
- assertTrue( readed.indexOf( "<name rdf:resource=\"Apache " + mavenProject.getName() + "\"/>" ) != -1 );
- assertTrue( readed.indexOf( "<programming-language rdf:resource=\"java\"/>" ) != -1 );
+ assertTrue( readed.indexOf( "<name>Apache " + mavenProject.getName() + "</name>" ) != -1 );
+ assertTrue( readed.indexOf( "<programming-language>java</programming-language>" ) != -1 );
// ASF ext
assertTrue( readed.indexOf( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 );
- assertTrue( readed.indexOf( "<asfext:name rdf:resource=\"Apache " + mavenProject.getName() + "\"/>" ) != -1 );
+ assertTrue( readed.indexOf( "<asfext:name>Apache " + mavenProject.getName() + "</asfext:name>" ) != -1 );
}
/**