Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D572419264 for ; Wed, 16 Mar 2016 15:05:55 +0000 (UTC) Received: (qmail 71644 invoked by uid 500); 16 Mar 2016 15:05:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 71428 invoked by uid 500); 16 Mar 2016 15:05:55 -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 71229 invoked by uid 99); 16 Mar 2016 15:05:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2016 15:05:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D075DFA0B; Wed, 16 Mar 2016 15:05:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Wed, 16 Mar 2016 15:06:02 -0000 Message-Id: <366d67b7ba394c9b9a5ce915ddd1c502@git.apache.org> In-Reply-To: <2afc3aa21906431598b07d36089d6a72@git.apache.org> References: <2afc3aa21906431598b07d36089d6a72@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cxf git commit: [CXF-6783], WSDL-generation: don't create anonymous top-level types This closes #110 This closes #109 [CXF-6783], WSDL-generation: don't create anonymous top-level types This closes #110 This closes #109 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0f829973 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0f829973 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0f829973 Branch: refs/heads/3.0.x-fixes Commit: 0f829973591ca1683410aa972e9b99c3f7a312a7 Parents: 41ce3c2 Author: Barnabas Bodnar Authored: Thu Feb 18 17:52:15 2016 +0100 Committer: Daniel Kulp Committed: Wed Mar 16 11:03:12 2016 -0400 ---------------------------------------------------------------------- .../cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0f829973/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java index a6a5e1f..e93d790 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java @@ -1297,9 +1297,11 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory wrappedMessage.getFirstMessagePart().setXmlSchema(el); - XmlSchemaComplexType ct = new XmlSchemaComplexType(schema, true); + boolean anonymousType = isAnonymousWrapperTypes(); + XmlSchemaComplexType ct = new XmlSchemaComplexType(schema, + /*CXF-6783: don't create anonymous top-level types*/!anonymousType); - if (!isAnonymousWrapperTypes()) { + if (!anonymousType) { ct.setName(wrapperName.getLocalPart()); el.setSchemaTypeName(wrapperName); }