cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r984879 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Date Thu, 12 Aug 2010 18:01:24 GMT
Author: dkulp
Date: Thu Aug 12 18:01:24 2010
New Revision: 984879

URL: http://svn.apache.org/viewvc?rev=984879&view=rev
Log:
[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/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=984879&r1=984878&r2=984879&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Thu Aug 12 18:01:24 2010
@@ -58,11 +58,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;
@@ -628,7 +628,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(),



Mime
View raw message