Author: dkulp Date: Fri Jan 15 01:08:29 2010 New Revision: 899505 URL: http://svn.apache.org/viewvc?rev=899505&view=rev Log: Merged revisions 899376 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r899376 | dkulp | 2010-01-14 14:47:38 -0500 (Thu, 14 Jan 2010) | 10 lines Merged revisions 899358 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r899358 | dkulp | 2010-01-14 14:00:58 -0500 (Thu, 14 Jan 2010) | 2 lines [CXF-2605] Make sure form="qualified" is put on the element if the form should be qualified and the schema is not. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Propchange: cxf/branches/2.1.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=899505&r1=899504&r2=899505&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Fri Jan 15 01:08:29 2010 @@ -1190,6 +1190,7 @@ mpi.setElementQName(newName); mpi.setConcreteName(newName); XmlSchemaUtils.setElementQName(el, newName); + el.setForm(new XmlSchemaForm(XmlSchemaForm.QUALIFIED)); } if (Collection.class.isAssignableFrom(mpi.getTypeClass())
