Author: dkulp
Date: Thu Oct 20 01:14:46 2011
New Revision: 1186593
URL: http://svn.apache.org/viewvc?rev=1186593&view=rev
Log:
Merged revisions 1186589 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1186589 | dkulp | 2011-10-19 20:50:19 -0400 (Wed, 19 Oct 2011) | 1 line
[CXF-3856] Use some of the ToolsConstants for the flags
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=1186593&r1=1186592&r2=1186593&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
Thu Oct 20 01:14:46 2011
@@ -24,6 +24,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.util.URIParserUtil;
public class WsdlOption extends Option {
@@ -149,16 +150,21 @@ public class WsdlOption extends Option {
list.add("true");
}
addIfTrue(list, isNoTypes(), "-noTypes");
- addIfTrue(list, isAllowElementRefs(), "-allowElementRefs");
- addIfTrue(list, isValidateWsdl(), "-validate");
- addIfTrue(list, isMarkGenerated() != null && isMarkGenerated(),
"-mark-generated");
+ addIfTrue(list, isAllowElementRefs(), "-" +
ToolConstants.CFG_ALLOW_ELEMENT_REFS);
+ addIfTrue(list, isValidateWsdl(), "-" +
ToolConstants.CFG_VALIDATE_WSDL);
+ addIfTrue(list, isMarkGenerated() != null && isMarkGenerated(),
+ "-" + ToolConstants.CFG_MARK_GENERATED);
addIfNotNull(list, getDefaultExcludesNamespace(), "-dex");
addIfNotNull(list, getDefaultNamespacePackageMapping(), "-dns");
addIfNotNull(list, getServiceName(), "-sn");
- addIfNotNull(list, getFaultSerialVersionUID(),
"-faultSerialVersionUID");
- addIfNotNull(list, getExceptionSuper(), "-exceptionSuper");
- addIfTrue(list, isAutoNameResolution(), "-autoNameResolution");
- addIfTrue(list, isNoAddressBinding(), "-noAddressBinding");
+ addIfNotNull(list, getFaultSerialVersionUID(), "-"
+ + ToolConstants.CFG_FAULT_SERIAL_VERSION_UID);
+ addIfNotNull(list, getExceptionSuper(), "-"
+ + ToolConstants.CFG_EXCEPTION_SUPER);
+ addIfTrue(list, isAutoNameResolution(), "-"
+ + ToolConstants.CFG_AUTORESOLVE);
+ addIfTrue(list, isNoAddressBinding(), "-"
+ + ToolConstants.CFG_NO_ADDRESS_BINDING);
addList(list, "-xjc", false, getXJCargs());
addList(list, "", false, getExtraargs());
if (isSetWsdlLocation()) {
