Author: dkulp
Date: Mon Oct 29 14:49:59 2007
New Revision: 589875
URL: http://svn.apache.org/viewvc?rev=589875&view=rev
Log:
Merged revisions 589808 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r589808 | bimargulies | 2007-10-29 15:26:42 -0400 (Mon, 29 Oct 2007) | 2 lines
Set the schema type on elements in some cases where it is possible and useful
to the javascript generator.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
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/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=589875&r1=589874&r2=589875&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 Oct 29 14:49:59 2007
@@ -684,6 +684,7 @@
XmlSchemaComplexType ct = new XmlSchemaComplexType(schema);
ct.setName(wrapperName.getLocalPart());
el.setSchemaTypeName(wrapperName);
+ el.setSchemaType(ct);
schema.addType(ct);
schema.getItems().add(ct);
@@ -699,6 +700,7 @@
el.setRefName(mpi.getElementQName());
} else {
el.setSchemaTypeName(mpi.getTypeQName());
+ el.setSchemaType((XmlSchemaType)mpi.getXmlSchema());
if
(schema.getElementFormDefault().getValue().equals(XmlSchemaForm.UNQUALIFIED)) {
mpi.setConcreteName(new QName(null,
mpi.getName().getLocalPart()));
}