Author: vsiveton
Date: Thu Mar 2 03:40:28 2006
New Revision: 382355
URL: http://svn.apache.org/viewcvs?rev=382355&view=rev
Log:
PR: MJAVADOC-52: locale error
Submitted by: pinghe
Reviewed by: Vincent Siveton
Applied and added a test case
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
(with props)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=382355&r1=382354&r2=382355&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Thu Mar 2 03:40:28 2006
@@ -606,6 +606,14 @@
StringBuffer options = new StringBuffer();
StringBuffer classpath = new StringBuffer();
+
+ if ( !StringUtils.isEmpty( this.locale ) )
+ {
+ options.append( "-locale " );
+ options.append( quotedArgument( this.locale ) );
+ options.append( " " );
+ }
+
try
{
for ( Iterator i =
getProject().getCompileClasspathElements().iterator(); i.hasNext(); )
@@ -761,7 +769,6 @@
cmd.setExecutable( getJavadocPath() );
// General javadoc arguments
- addArgIfNotEmpty( arguments, "-locale", quotedArgument( this.locale )
);
addArgIf( arguments, breakiterator, "-breakiterator", 1.4f );
if ( !StringUtils.isEmpty( doclet ) )
{
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml?rev=382355&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
Thu Mar 2 03:40:28 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.javadoc.test2</groupId>
+ <artifactId>javadoc-plugin-test2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2006</inceptionYear>
+ <name>Maven Javadoc Plugin Test2 for MJAVADOC-52</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512</maxmemory>
+ <locale>zh_CN</locale>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java?rev=382355&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
Thu Mar 2 03:40:28 2006
@@ -0,0 +1,23 @@
+package org.apache.maven.plugin.javadoc.test1;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ /**
+ * @.todo to do
+ * @.usage usage is java org.apache.maven.plugin.javadoc.test1.App
+ * @.fixme Fix me!
+ *
+ * @see System#out
+ * @see org.apache.maven.MavenException
+ *
+ * @param args
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java?rev=382355&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
Thu Mar 2 03:40:28 2006
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.javadoc.test2;
+
+/**
+ * Hello world!
+ *
+ */
+public class App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/main/java/org/apache/maven/plugin/javadoc/test2/App2.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java?rev=382355&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
Thu Mar 2 03:40:28 2006
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.javadoc.test1;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test2/src/test/java/org/apache/maven/plugin/javadoc/test1/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
