LPS-62137 Rename for consistency

brianchandotcom · Jan 21, 2016 · f6c28ec · f6c28ec
1 parent 22af785
commit f6c28ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -1727,12 +1727,12 @@ rerun your task.
 			newenvironment="true"
 		>
 			<jvmarg value="-Xmx2048m" />
+			<arg value="javadoc.generate.xml=${generate.xml}" />
 			<arg value="javadoc.init=${init}" />
 			<arg value="javadoc.input.dir=${input.dir}" />
 			<arg value="javadoc.limit=${limit}" />
 			<arg value="javadoc.output.file.prefix=${output.file.prefix}" />
 			<arg value="javadoc.update=${update}" />
-			<arg value="javadoc.xml=${xml}" />
 		</java>
 	</target>
 

diff --git a/build-dist.xml b/build-dist.xml
@@ -987,7 +987,7 @@ release was successful.</echo>
 		<ant dir="portal-impl" inheritall="false" target="compile-test" />
 
 		<ant inheritall="false" target="format-javadoc">
-			<property name="xml" value="true" />
+			<property name="generate.xml" value="true" />
 		</ant>
 
 		<delete>
@@ -1000,7 +1000,7 @@ release was successful.</echo>
 		<ant dir="${lp.plugins.dir}" inheritall="false" target="compile" />
 
 		<ant dir="${lp.plugins.dir}" inheritall="false" target="format-javadoc">
-			<property name="xml" value="true" />
+			<property name="generate.xml" value="true" />
 		</ant>
 
 		<parallel>

diff --git a/.../util/javadoc-formatter/src/main/java/com/liferay/javadoc/formatter/JavadocFormatter.java b/.../util/javadoc-formatter/src/main/java/com/liferay/javadoc/formatter/JavadocFormatter.java
@@ -107,7 +107,8 @@ public JavadocFormatter(Map<String, String> arguments) throws Exception {
 
 		_author = author;
 
-		_generateXml = GetterUtil.getBoolean(arguments.get("javadoc.xml"));
+		_generateXml = GetterUtil.getBoolean(
+			arguments.get("javadoc.generate.xml"));
 
 		String init = arguments.get("javadoc.init");
 

diff --git a/...avadoc-formatter/src/main/java/com/liferay/javadoc/formatter/JavadocFormatterInvoker.java b/...avadoc-formatter/src/main/java/com/liferay/javadoc/formatter/JavadocFormatterInvoker.java
@@ -36,7 +36,7 @@ public static JavadocFormatter invoke(
 
 		arguments.put("javadoc.author", javadocFormatterArgs.getAuthor());
 		arguments.put(
-			"javadoc.xml",
+			"javadoc.generate.xml",
 			String.valueOf(javadocFormatterArgs.isGenerateXml()));
 		arguments.put(
 			"javadoc.init",