Author: dkulp
Date: Thu Aug 12 18:03:27 2010
New Revision: 984883
URL: http://svn.apache.org/viewvc?rev=984883&view=rev
Log:
Merged revisions 984879 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r984879 | dkulp | 2010-08-12 14:01:24 -0400 (Thu, 12 Aug 2010) | 3 lines
[CXF-2891] If using user supplied schema, turn off the generation of the
wrapper types so we can modify the schema as needed to properly model
the wrappers
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=984883&r1=984882&r2=984883&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Thu Aug 12 18:03:27 2010
@@ -57,11 +57,11 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.util.XMLSchemaQNames;
+import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.JAXWSMethodDispatcher;
import org.apache.cxf.jaxws.JAXWSProviderMethodDispatcher;
import org.apache.cxf.jaxws.WrapperClassGenerator;
@@ -620,7 +620,9 @@ public class JaxWsServiceFactoryBean ext
}
private Set<Class<?>> generatedWrapperBeanClass() {
- if (getDataBinding() instanceof JAXBDataBinding) {
+ DataBinding b = getDataBinding();
+ if (b.getClass().getName().endsWith("JAXBDataBinding")
+ && schemaLocations == null) {
ServiceInfo serviceInfo = getService().getServiceInfos().get(0);
WrapperClassGenerator wrapperGen = new WrapperClassGenerator(this,
serviceInfo.getInterface(),
