Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 40693 invoked from network); 9 Mar 2011 12:54:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Mar 2011 12:54:41 -0000 Received: (qmail 88575 invoked by uid 500); 9 Mar 2011 12:54:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88513 invoked by uid 500); 9 Mar 2011 12:54:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 88506 invoked by uid 99); 9 Mar 2011 12:54:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 12:54:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 12:54:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 325252388A2C; Wed, 9 Mar 2011 12:54:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1079780 - in /cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/ tools/wsdlto/frontend/jaxws/src/ma... Date: Wed, 09 Mar 2011 12:54:16 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110309125416.325252388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Wed Mar 9 12:54:15 2011 New Revision: 1079780 URL: http://svn.apache.org/viewvc?rev=1079780&view=rev Log: CXF-3385 Add a new option in WSD2Java to skip the generate the type classes from schema Modified: cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=1079780&r1=1079779&r2=1079780&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Wed Mar 9 12:54:15 2011 @@ -63,6 +63,7 @@ public final class ToolConstants { public static final String CFG_EXTRA_SOAPHEADER = "exsoapheader"; public static final String CFG_DEFAULT_NS = "defaultns"; public static final String CFG_DEFAULT_EX = "defaultex"; + public static final String CXF_GENERATE_TYPES = "generatetypes"; public static final String CFG_XJC_ARGS = "xjc"; public static final String CFG_CATALOG = "catalog"; public static final String CFG_DEFAULT_VALUES = "defaultValues"; Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java?rev=1079780&r1=1079779&r2=1079780&view=diff ============================================================================== --- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java (original) +++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java Wed Mar 9 12:54:15 2011 @@ -134,6 +134,12 @@ public class Option { * Enables validating the WSDL before generating the code. */ Boolean validateWsdl; + + + /** + * Enables or disables generation of the type classes. Default value is true. + */ + Boolean generateTypes; /** * Enables generation of fault Exception's SUID based on hash of classname. @@ -314,6 +320,14 @@ public class Option { public void setValidateWsdl(boolean validateWsdl) { this.validateWsdl = validateWsdl; } + + public boolean isGenerateTypes() { + return generateTypes == null ? true : generateTypes; + } + + public void setGenerateTypes(boolean generateTypes) { + this.generateTypes = generateTypes; + } public boolean isUseFQCNForFaultSerialVersionUID() { return useFQCNForFaultSerialVersionUID == null ? false : useFQCNForFaultSerialVersionUID; @@ -398,6 +412,7 @@ public class Option { destination.setPackagenames(getPackagenames()); destination.setServiceName(getServiceName()); destination.setValidateWsdl(isValidateWsdl()); + destination.setGenerateTypes(isGenerateTypes()); destination.setUseFQCNForFaultSerialVersionUID(isUseFQCNForFaultSerialVersionUID()); destination.setMarkGenerated(isMarkGenerated()); destination.setAllowElementRefs(isAllowElementRefs()); @@ -417,6 +432,7 @@ public class Option { public void merge(Option defaultOptions) { wsdlList = setIfNull(wsdlList, defaultOptions.wsdlList); extendedSoapHeaders = setIfNull(extendedSoapHeaders, defaultOptions.extendedSoapHeaders); + generateTypes = setIfNull(generateTypes, defaultOptions.generateTypes); validateWsdl = setIfNull(validateWsdl, defaultOptions.validateWsdl); useFQCNForFaultSerialVersionUID = setIfNull(useFQCNForFaultSerialVersionUID, defaultOptions.useFQCNForFaultSerialVersionUID); Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=1079780&r1=1079779&r2=1079780&view=diff ============================================================================== --- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java (original) +++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java Wed Mar 9 12:54:15 2011 @@ -148,6 +148,10 @@ public class WsdlOption extends Option { list.add("-exsh"); list.add("true"); } + if (!isGenerateTypes()) { + list.add("-gt"); + list.add("false"); + } addIfTrue(list, isAllowElementRefs(), "-allowElementRefs"); addIfTrue(list, isValidateWsdl(), "-validate"); addIfTrue(list, isUseFQCNForFaultSerialVersionUID(), "-useFQCNForFaultSerialVersionUID"); Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1079780&r1=1079779&r2=1079780&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original) +++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Wed Mar 9 12:54:15 2011 @@ -237,6 +237,13 @@ public class WSDLToJavaContainer extends context.put(ServiceInfo.class, null); } } + + if (!context.getBooleanValue(ToolConstants.CXF_GENERATE_TYPES, "true")) { + context.remove(ToolConstants.CFG_TYPES); + context.remove(ToolConstants.CFG_ALL); + context.remove(ToolConstants.CFG_COMPILE); + } + generateTypes(); for (ServiceInfo service : serviceList) { @@ -573,6 +580,9 @@ public class WSDLToJavaContainer extends || context.optionSet(ToolConstants.CFG_GEN_FAULT)) { return true; } + if (!context.getBooleanValue(ToolConstants.CXF_GENERATE_TYPES, "true")) { + return true; + } return false; } Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml?rev=1079780&r1=1079779&r2=1079780&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml (original) +++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdlto.xml Wed Mar 9 12:54:15 2011 @@ -173,6 +173,16 @@ under the License. true|false + + + +