You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/03/10 23:14:32 UTC
svn commit: r635725 - in /maven/shared/trunk/maven-model-converter/src:
main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
test/resources/PCCJavadocTest1.properties
Author: dennisl
Date: Mon Mar 10 15:14:29 2008
New Revision: 635725
URL: http://svn.apache.org/viewvc?rev=635725&view=rev
Log:
[MONE-23] one:convert kept <links>a,b,c</links> vs making <links><link>a</link><link>b</link><link>c</link></links>
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java?rev=635725&r1=635724&r2=635725&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java Mon Mar 10 15:14:29 2008
@@ -79,7 +79,21 @@
addConfigurationChild( configuration, "isOffline", PropertyUtils.invertBoolean( online ) );
}
- addConfigurationChild( configuration, projectProperties, "maven.javadoc.links", "links" );
+ String links = projectProperties.getProperty( "maven.javadoc.links" );
+ if ( links != null )
+ {
+ StringTokenizer tokenizer = new StringTokenizer( links, " ," );
+ if ( tokenizer.hasMoreTokens() )
+ {
+ Xpp3Dom linksConfiguration = new Xpp3Dom( "links" );
+ while ( tokenizer.hasMoreTokens() )
+ {
+ String link = tokenizer.nextToken();
+ addConfigurationChild( linksConfiguration, "link", link );
+ }
+ configuration.addChild( linksConfiguration );
+ }
+ }
addConfigurationChild( configuration, projectProperties, "maven.javadoc.locale", "locale" );
Modified: maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java?rev=635725&r1=635724&r2=635725&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java (original)
+++ maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java Mon Mar 10 15:14:29 2008
@@ -87,8 +87,24 @@
value = configuration.getChild( "isOffline" ).getValue();
Assert.assertEquals( "check isOffline value", "false", value );
- value = configuration.getChild( "links" ).getValue();
- Assert.assertEquals( "check links value", "http://java.sun.com/j2se/1.4/docs/api/", value );
+ Xpp3Dom links = configuration.getChild( "links" );
+ if ( links.getChildCount() == 2 )
+ {
+ Xpp3Dom tagOne = links.getChild( 0 );
+
+ value = tagOne.getValue();
+ Assert.assertEquals( "check links/link value", "http://java.sun.com/j2se/1.4/docs/api/", value );
+
+ Xpp3Dom tagTwo = links.getChild( 1 );
+
+ value = tagTwo.getValue();
+ Assert.assertEquals( "check links/link value", "http://java.sun.com/j2ee/sdk_1.3/techdocs/api/",
+ value );
+ }
+ else
+ {
+ Assert.fail( "Wrong number of link elements" );
+ }
value = configuration.getChild( "locale" ).getValue();
Assert.assertEquals( "check locale value", "en_US", value );
Modified: maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties?rev=635725&r1=635724&r2=635725&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties (original)
+++ maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties Mon Mar 10 15:14:29 2008
@@ -40,7 +40,7 @@
maven.javadoc.excludepackagenames=org.apache.internal,org.apache.test
maven.javadoc.footer=The footer
maven.javadoc.header=The header
-maven.javadoc.links=http://java.sun.com/j2se/1.4/docs/api/
+maven.javadoc.links=http://java.sun.com/j2se/1.4/docs/api/, http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
maven.javadoc.locale=en_US
maven.javadoc.maxmemory=1024m
maven.javadoc.mode.online=true