Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 43207 invoked from network); 14 Jan 2008 16:31:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2008 16:31:30 -0000 Received: (qmail 14103 invoked by uid 500); 14 Jan 2008 16:31:20 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 14054 invoked by uid 500); 14 Jan 2008 16:31:20 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 14045 invoked by uid 99); 14 Jan 2008 16:31:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 08:31:20 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 16:31:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 605AC1A9832; Mon, 14 Jan 2008 08:31:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r611848 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ Date: Mon, 14 Jan 2008 16:31:07 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080114163109.605AC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jan 14 08:31:02 2008 New Revision: 611848 URL: http://svn.apache.org/viewvc?rev=611848&view=rev Log: Merged revisions 610665 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r610665 | mmao | 2008-01-09 23:04:21 -0500 (Wed, 09 Jan 2008) | 5 lines CXF-1364 Frontend pass the quolified attribute to the Jaxb Databinding thus in case of jaxws, the unqualified been used ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=611848&r1=611847&r2=611848&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Mon Jan 14 08:31:02 2008 @@ -102,9 +102,15 @@ private Map contextProperties = Collections.emptyMap(); private Map marshallerProperties = Collections.emptyMap(); + private boolean qualifiedSchemas; + public JAXBDataBinding() { } + + public JAXBDataBinding(boolean q) { + this.qualifiedSchemas = q; + } public JAXBDataBinding(Class...classes) throws JAXBException { contextClasses = new HashSet>(); @@ -278,7 +284,10 @@ } } - JAXBSchemaInitializer schemaInit = new JAXBSchemaInitializer(serviceInfo, col, riContext); + JAXBSchemaInitializer schemaInit = new JAXBSchemaInitializer(serviceInfo, + col, + riContext, + this.qualifiedSchemas); schemaInit.walk(); } } Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=611848&r1=611847&r2=611848&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Mon Jan 14 08:31:02 2008 @@ -58,11 +58,16 @@ private SchemaCollection schemas; private JAXBContextImpl context; + private final boolean qualifiedSchemas; - public JAXBSchemaInitializer(ServiceInfo serviceInfo, SchemaCollection col, JAXBContextImpl context) { + public JAXBSchemaInitializer(ServiceInfo serviceInfo, + SchemaCollection col, + JAXBContextImpl context, + boolean q) { super(serviceInfo); schemas = col; this.context = context; + this.qualifiedSchemas = q; } @Override @@ -307,7 +312,10 @@ XmlSchema schema; if (schemaInfo == null) { schema = schemas.newXmlSchemaInCollection(part.getElementQName().getNamespaceURI()); - schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); + + if (qualifiedSchemas) { + schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); + } NamespaceMap nsMap = new NamespaceMap(); nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, schema.getTargetNamespace()); Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=611848&r1=611847&r2=611848&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Jan 14 08:31:02 2008 @@ -139,7 +139,7 @@ public ReflectionServiceFactoryBean() { getServiceConfigurations().add(0, new DefaultServiceConfiguration()); - setDataBinding(new JAXBDataBinding()); + setDataBinding(new JAXBDataBinding(getQualifyWrapperSchema())); ignoredClasses.add("java.lang.Object"); ignoredClasses.add("java.lang.Throwable"); @@ -830,7 +830,7 @@ anonymousWrappers = b; } - public boolean getQualifyWrapperSchema() { + public final boolean getQualifyWrapperSchema() { return qualifiedSchemas; } public boolean isQualifyWrapperSchema() { @@ -1116,6 +1116,7 @@ if (qualified) { schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); } + schemaInfo.setSchema(schema); Map explicitNamespaceMappings = this.getDataBinding().getDeclaredNamespaceMappings();