Added: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXBDefaultFaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXBDefaultFaultOutInterceptor.java?rev=1490642&view=auto ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXBDefaultFaultOutInterceptor.java (added) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXBDefaultFaultOutInterceptor.java Fri Jun 7 13:36:13 2013 @@ -0,0 +1,97 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.jaxrs.interceptor; + +import java.util.ResourceBundle; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.w3c.dom.Node; + +import org.apache.cxf.common.i18n.BundleUtils; +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.helpers.NSStack; +import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.Phase; +import org.apache.cxf.staxutils.StaxUtils; + +public class JAXBDefaultFaultOutInterceptor extends AbstractOutDatabindingInterceptor { + + private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JAXBDefaultFaultOutInterceptor.class); + + public JAXBDefaultFaultOutInterceptor() { + super(Phase.MARSHAL); + } + public JAXBDefaultFaultOutInterceptor(String phase) { + super(phase); + } + + public void handleMessage(Message message) throws Fault { + + if (mustPropogateException(message)) { + throw (Fault) message.getContent(Exception.class); + } + + Fault f = (Fault) message.getContent(Exception.class); + message.put(org.apache.cxf.message.Message.RESPONSE_CODE, f.getStatusCode()); + NSStack nsStack = new NSStack(); + nsStack.push(); + + XMLStreamWriter writer = message.getContent(XMLStreamWriter.class); + try { + nsStack.add("http://cxf.apache.org/bindings/xformat";); + String prefix = nsStack.getPrefix("http://cxf.apache.org/bindings/xformat";); + StaxUtils.writeStartElement(writer, prefix, "XMLFault", + "http://cxf.apache.org/bindings/xformat";); + StaxUtils.writeStartElement(writer, prefix, "faultstring", + "http://cxf.apache.org/bindings/xformat";); + Throwable t = f.getCause(); + writer.writeCharacters(t == null ? f.getMessage() : t.toString()); + // fault string + writer.writeEndElement(); + // call StaxUtils to write Fault detail. + + if (f.getDetail() != null) { + StaxUtils.writeStartElement(writer, prefix, "detail", "http://cxf.apache.org/bindings/xformat";); + StaxUtils.writeNode(DOMUtils.getChild(f.getDetail(), Node.ELEMENT_NODE), + writer, false); + writer.writeEndElement(); + } + // fault root + writer.writeEndElement(); + writer.flush(); + } catch (XMLStreamException xe) { + throw new Fault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), xe); + } + } + + @Override + public void handleFault(Message message) throws Fault { + if (mustPropogateException(message)) { + throw (Fault) message.getContent(Exception.class); + } + } + + protected boolean mustPropogateException(Message m) { + return Boolean.TRUE.equals(m.getExchange().get(Message.PROPOGATE_EXCEPTION)); + } +}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Fri Jun 7 13:36:13 2013 @@ -49,9 +49,9 @@ import org.apache.cxf.resource.DefaultRe import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceInfo; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; /** * Factory for creating JAX-WS proxies, This class provides access to the Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Fri Jun 7 13:36:13 2013 @@ -37,6 +37,7 @@ import javax.jws.WebService; import javax.wsdl.Definition; import javax.wsdl.Port; import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.http.HTTPAddress; import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.soap12.SOAP12Address; import javax.wsdl.extensions.soap12.SOAP12Binding; @@ -86,7 +87,6 @@ import org.apache.cxf.jaxws.support.JaxW import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; import org.apache.cxf.service.Service; import org.apache.cxf.service.factory.AbstractServiceFactoryBean; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.EndpointInfo; @@ -95,9 +95,10 @@ import org.apache.cxf.service.model.Serv import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; import org.apache.cxf.wsdl.WSDLManager; import org.apache.cxf.wsdl.http.AddressType; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLServiceFactory; public class ServiceImpl extends ServiceDelegate { @@ -189,6 +190,8 @@ public class ServiceImpl extends Service address = ((SOAP12Address)e).getLocationURI(); } else if (e instanceof SOAPAddress) { address = ((SOAPAddress)e).getLocationURI(); + } else if (e instanceof HTTPAddress) { + address = ((HTTPAddress)e).getLocationURI(); } } addPort(name, bindingID, address); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Fri Jun 7 13:36:13 2013 @@ -49,12 +49,12 @@ import org.apache.cxf.common.util.Packag import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.JavaUtils; import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.SchemaInfo; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public final class WrapperClassGenerator extends ASMHelper { public static final String DEFAULT_PACKAGE_NAME = "defaultnamespace"; Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Fri Jun 7 13:36:13 2013 @@ -38,13 +38,13 @@ import org.apache.cxf.message.MessageCon import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.BindingMessageInfo; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceModelUtil; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public class WrapperClassInInterceptor extends AbstractPhaseInterceptor<Message> { Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Fri Jun 7 13:36:13 2013 @@ -37,13 +37,13 @@ import org.apache.cxf.message.MessageCon import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.BindingMessageInfo; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceModelUtil; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message> { public WrapperClassOutInterceptor() { Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Fri Jun 7 13:36:13 2013 @@ -57,13 +57,13 @@ import org.apache.cxf.common.util.Packag import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxws.JaxWsConfigurationException; -import org.apache.cxf.service.factory.AbstractServiceConfiguration; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; +import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public class JaxWsServiceConfiguration extends AbstractServiceConfiguration { 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=1490642&r1=1490641&r2=1490642&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 Fri Jun 7 13:36:13 2013 @@ -69,10 +69,8 @@ import org.apache.cxf.jaxws.JAXWSProvide import org.apache.cxf.jaxws.WrapperClassGenerator; import org.apache.cxf.jaxws.interceptors.WebFaultOutInterceptor; import org.apache.cxf.jaxws.spi.ProviderImpl; -import org.apache.cxf.service.factory.AbstractServiceConfiguration; import org.apache.cxf.service.factory.FactoryBeanListener; import org.apache.cxf.service.factory.FactoryBeanListener.Event; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.service.invoker.Invoker; import org.apache.cxf.service.invoker.SingletonFactory; @@ -86,6 +84,8 @@ import org.apache.cxf.service.model.Mess import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.ws.addressing.JAXWSAConstants; +import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLServiceBuilder; /** Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java Fri Jun 7 13:36:13 2013 @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public class WebServiceProviderConfiguration extends JaxWsServiceConfiguration { Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Fri Jun 7 13:36:13 2013 @@ -66,10 +66,10 @@ import org.apache.cxf.jaxws.service.SayH import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; import org.apache.cxf.message.Message; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.transport.local.LocalTransportFactory; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.ServiceWSDLBuilder; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java Fri Jun 7 13:36:13 2013 @@ -40,11 +40,11 @@ import org.apache.cxf.jaxws.service.Hell import org.apache.cxf.jaxws.support.JaxWsImplementorInfo; import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.wsdl.WSDLManager; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.ServiceWSDLBuilder; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java Fri Jun 7 13:36:13 2013 @@ -26,9 +26,9 @@ import org.w3c.dom.Node; import org.apache.cxf.frontend.ServerFactoryBean; import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.transport.local.LocalTransportFactory; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java Fri Jun 7 13:36:13 2013 @@ -40,12 +40,12 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.transport.Destination; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.hello_world_soap_http.BadRecordLitFault; import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.GreeterImpl; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java Fri Jun 7 13:36:13 2013 @@ -34,10 +34,10 @@ import org.apache.cxf.message.ExchangeIm import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.ServiceModelUtil; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.hello_world_soap_http.GreeterImpl; import org.apache.hello_world_soap_http.RPCLitGreeterImpl; import org.junit.Before; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java Fri Jun 7 13:36:13 2013 @@ -31,9 +31,9 @@ import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.transport.local.LocalTransportFactory; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.hello_world_soap_http.GreeterImpl; import org.junit.Before; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java Fri Jun 7 13:36:13 2013 @@ -37,11 +37,12 @@ import org.apache.cxf.message.ExchangeIm import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.test.AbstractCXFTest; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; + import org.junit.Before; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java Fri Jun 7 13:36:13 2013 @@ -36,11 +36,11 @@ import org.apache.cxf.message.ExchangeIm import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.test.AbstractCXFTest; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.hello_world_soap_http.RPCLitGreeterImpl; import org.junit.Before; import org.junit.Test; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java Fri Jun 7 13:36:13 2013 @@ -34,11 +34,11 @@ import javax.xml.namespace.QName; import org.apache.cxf.Bus; import org.apache.cxf.binding.BindingFactoryManager; -import org.apache.cxf.catalog.CatalogWSDLLocator; import org.apache.cxf.service.model.MessageInfo; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.wsdl11.CatalogWSDLLocator; import org.apache.cxf.wsdl11.WSDLServiceBuilder; import org.easymock.EasyMock; import org.easymock.IMocksControl; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Fri Jun 7 13:36:13 2013 @@ -44,7 +44,6 @@ import org.apache.cxf.jaxws.AbstractJaxW import org.apache.cxf.mtom_xop.TestMtomImpl; import org.apache.cxf.no_body_parts.NoBodyPartsImpl; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.service.model.FaultInfo; import org.apache.cxf.service.model.InterfaceInfo; @@ -53,6 +52,7 @@ import org.apache.cxf.service.model.Mess import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.service.model.ServiceInfo; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.ServiceWSDLBuilder; import org.apache.hello_world_soap_http.GreeterImpl; import org.apache.ws.commons.schema.XmlSchemaElement; Modified: cxf/trunk/rt/frontend/simple/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/pom.xml (original) +++ cxf/trunk/rt/frontend/simple/pom.xml Fri Jun 7 13:36:13 2013 @@ -36,6 +36,7 @@ <properties> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}", + com.sun.tools*;resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" </cxf.osgi.import> </properties> @@ -106,6 +107,11 @@ <artifactId>cxf-rt-bindings-soap</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-wsdl</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -113,6 +119,13 @@ <version>${project.version}</version> <optional>true</optional> </dependency> + + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-jaxb</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> <!-- if this is present, then the validation feature will check W3C schema if Xerces is available. --> Copied: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (from r1490629, cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?p2=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java&p1=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java&r1=1490629&r2=1490642&rev=1490642&view=diff ============================================================================== (empty) Copied: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/Messages.properties (from r1490629, cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/Messages.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/Messages.properties?p2=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/Messages.properties&p1=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/Messages.properties&r1=1490629&r2=1490642&rev=1490642&view=diff ============================================================================== (empty) Copied: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java (from r1490629, cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java?p2=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java&p1=cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java&r1=1490629&r2=1490642&rev=1490642&view=diff ============================================================================== (empty) Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java Fri Jun 7 13:36:13 2013 @@ -21,11 +21,11 @@ package org.apache.cxf.frontend; import java.io.File; import org.apache.cxf.service.ServiceBuilder; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLEndpointFactory; public abstract class AbstractServiceFactory extends AbstractWSDLBasedEndpointFactory implements Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Fri Jun 7 13:36:13 2013 @@ -35,9 +35,7 @@ import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.endpoint.EndpointException; import org.apache.cxf.endpoint.EndpointImpl; import org.apache.cxf.service.Service; -import org.apache.cxf.service.factory.AbstractServiceConfiguration; import org.apache.cxf.service.factory.FactoryBeanListener; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.BindingOperationInfo; @@ -48,6 +46,8 @@ import org.apache.cxf.transport.ConduitI import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.local.LocalTransportFactory; +import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLEndpointFactory; public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointFactory { Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Fri Jun 7 13:36:13 2013 @@ -28,11 +28,11 @@ import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.endpoint.EndpointException; import org.apache.cxf.feature.Feature; import org.apache.cxf.service.factory.FactoryBeanListener; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLEndpointFactory; public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory { Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Fri Jun 7 13:36:13 2013 @@ -42,7 +42,7 @@ import org.apache.cxf.feature.Feature; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider; import org.apache.cxf.service.factory.FactoryBeanListener; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; /** * This class will create a client for you which implements the specified Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Fri Jun 7 13:36:13 2013 @@ -32,7 +32,6 @@ import org.apache.cxf.endpoint.Server; import org.apache.cxf.endpoint.ServerImpl; import org.apache.cxf.feature.Feature; import org.apache.cxf.service.factory.FactoryBeanListener; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.factory.ServiceConstructionException; import org.apache.cxf.service.invoker.BeanInvoker; import org.apache.cxf.service.invoker.FactoryInvoker; @@ -41,6 +40,7 @@ import org.apache.cxf.service.invoker.Si import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.wsdl11.WSDLEndpointFactory; Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java Fri Jun 7 13:36:13 2013 @@ -30,7 +30,7 @@ import org.apache.cxf.common.injection.N import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; import org.apache.cxf.frontend.ServerFactoryBean; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanDefinitionStoreException; Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java Fri Jun 7 13:36:13 2013 @@ -20,7 +20,7 @@ package org.apache.cxf.simple; import org.apache.cxf.frontend.AbstractServiceFactory; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; public class SimpleServiceBuilder extends AbstractServiceFactory { Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original) +++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Fri Jun 7 13:36:13 2013 @@ -41,6 +41,8 @@ import org.apache.cxf.service.model.Mess import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.service.model.ServiceInfo; +import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration; +import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean; import org.apache.ws.commons.schema.XmlSchemaElement; import org.junit.Test; Modified: cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java (original) +++ cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java Fri Jun 7 13:36:13 2013 @@ -48,7 +48,8 @@ import org.apache.cxf.jaxws.JaxWsProxyFa import org.apache.cxf.service.model.SchemaInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.test.AbstractCXFSpringTest; -import org.apache.cxf.wsdl.EndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; + import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; Modified: cxf/trunk/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml (original) +++ cxf/trunk/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml Fri Jun 7 13:36:13 2013 @@ -43,7 +43,7 @@ </bean> </simple:dataBinding> <simple:serviceFactory> - <bean class='org.apache.cxf.service.factory.ReflectionServiceFactoryBean'> + <bean class='org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean'> </bean> </simple:serviceFactory> Modified: cxf/trunk/rt/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/pom.xml (original) +++ cxf/trunk/rt/pom.xml Fri Jun 7 13:36:13 2013 @@ -34,6 +34,7 @@ <modules> <module>core</module> + <module>wsdl</module> <module>transports/local</module> <module>databinding/jaxb</module> <module>databinding/xmlbeans</module> Modified: cxf/trunk/rt/transports/http-jetty/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/pom.xml (original) +++ cxf/trunk/rt/transports/http-jetty/pom.xml Fri Jun 7 13:36:13 2013 @@ -137,7 +137,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-wsdl</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (original) +++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Fri Jun 7 13:36:13 2013 @@ -70,8 +70,8 @@ import org.apache.cxf.transports.http.St import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.EndpointReferenceType; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.wsdl.EndpointReferenceUtils; import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.server.Request; Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java (original) +++ cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java Fri Jun 7 13:36:13 2013 @@ -72,8 +72,8 @@ import org.apache.cxf.transports.http.St import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.EndpointReferenceType; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.wsdl.EndpointReferenceUtils; import org.easymock.EasyMock; import org.junit.After; Modified: cxf/trunk/rt/transports/http/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/pom.xml (original) +++ cxf/trunk/rt/transports/http/pom.xml Fri Jun 7 13:36:13 2013 @@ -78,6 +78,12 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-wsdl</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> <version>${project.version}</version> <scope>provided</scope> Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Fri Jun 7 13:36:13 2013 @@ -75,8 +75,7 @@ import org.apache.cxf.transport.https.Ce import org.apache.cxf.transport.https.CertConstraintsInterceptor; import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; -import org.apache.cxf.wsdl.WSDLLibrary; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; /** * Common base for HTTP Destination implementations. @@ -487,7 +486,7 @@ public abstract class AbstractHTTPDestin if (pde != null) { server = pde.getServerEndpointPolicy(endpointInfo, this, new ServerPolicyCalculator()); } - if (null == server && WSDLLibrary.isAvailable()) { + if (null == server) { server = endpointInfo.getTraversedExtensor( new HTTPServerPolicy(), HTTPServerPolicy.class); } Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Fri Jun 7 13:36:13 2013 @@ -31,9 +31,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Resource; -import javax.wsdl.extensions.http.HTTPAddress; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.xml.namespace.QName; import org.apache.cxf.Bus; import org.apache.cxf.common.injection.NoJSR250Annotations; @@ -51,8 +48,6 @@ import org.apache.cxf.transport.Destinat import org.apache.cxf.transport.servlet.ServletDestinationFactory; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl.http.AddressType; -import org.apache.cxf.wsdl11.WSDLEndpointFactory; - /** * @@ -60,7 +55,7 @@ import org.apache.cxf.wsdl11.WSDLEndpoin @NoJSR250Annotations(unlessNull = "bus") public class HTTPTransportFactory extends AbstractTransportFactory - implements WSDLEndpointFactory, ConduitInitiator, DestinationFactory { + implements ConduitInitiator, DestinationFactory { public static final List<String> DEFAULT_NAMESPACES @@ -134,15 +129,7 @@ public class HTTPTransportFactory for (Iterator<?> itr = ees.iterator(); itr.hasNext();) { Object extensor = itr.next(); - if (extensor instanceof HTTPAddress) { - final HTTPAddress httpAdd = (HTTPAddress)extensor; - - EndpointInfo info = new HttpEndpointInfo(serviceInfo, - "http://schemas.xmlsoap.org/wsdl/http/";); - info.setAddress(httpAdd.getLocationURI()); - info.addExtensor(httpAdd); - return info; - } else if (extensor instanceof AddressType) { + if (extensor instanceof AddressType) { final AddressType httpAdd = (AddressType)extensor; EndpointInfo info = @@ -157,7 +144,7 @@ public class HTTPTransportFactory HttpEndpointInfo hei = new HttpEndpointInfo(serviceInfo, "http://schemas.xmlsoap.org/wsdl/http/";); - AddressType at = new HttpAddressType(); + AddressType at = new AddressType(); hei.addExtensor(at); return hei; @@ -211,25 +198,6 @@ public class HTTPTransportFactory } } - private static class HttpAddressType extends AddressType - implements HTTPAddress, SOAPAddress { - private static final long serialVersionUID = 7048265985129995746L; - - public HttpAddressType() { - super(); - setElementType(new QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); - } - - public String getLocationURI() { - return getLocation(); - } - - public void setLocationURI(String locationURI) { - setLocation(locationURI); - } - - } - /** * This call creates a new HTTPConduit for the endpoint. It is equivalent * to calling getConduit without an EndpointReferenceType. Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPWSDLExtensionLoader.java Fri Jun 7 13:36:13 2013 @@ -19,7 +19,6 @@ package org.apache.cxf.transport.http; -import javax.wsdl.extensions.ExtensibilityElement; import javax.xml.bind.JAXBException; import org.apache.cxf.Bus; @@ -27,6 +26,7 @@ import org.apache.cxf.common.injection.N import org.apache.cxf.wsdl.JAXBExtensionHelper; import org.apache.cxf.wsdl.WSDLExtensionLoader; import org.apache.cxf.wsdl.WSDLManager; +import org.apache.cxf.wsdl.http.AddressType; /** * @@ -42,11 +42,11 @@ public final class HTTPWSDLExtensionLoad createExtensor(manager, javax.wsdl.Port.class, org.apache.cxf.transports.http.configuration.HTTPServerPolicy.class); createExtensor(manager, javax.wsdl.Port.class, - org.apache.cxf.wsdl.http.AddressType.class); + AddressType.class); } public void createExtensor(WSDLManager manager, Class<?> parentType, - Class<? extends ExtensibilityElement> elementType) { + Class<?> elementType) { try { JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(), parentType, Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java Fri Jun 7 13:36:13 2013 @@ -23,7 +23,6 @@ import java.net.URI; import javax.servlet.http.HttpServletRequest; import org.apache.cxf.transport.AbstractDestination; -import org.apache.cxf.wsdl.WSDLLibrary; import org.apache.cxf.wsdl.http.AddressType; public final class BaseUrlHelper { @@ -58,8 +57,7 @@ public final class BaseUrlHelper { public static void setAddress(AbstractDestination dest, String absAddress) { dest.getEndpointInfo().setAddress(absAddress); - if (WSDLLibrary.isAvailable() - && dest.getEndpointInfo().getExtensor(AddressType.class) != null) { + if (dest.getEndpointInfo().getExtensor(AddressType.class) != null) { dest.getEndpointInfo().getExtensor(AddressType.class).setLocation(absAddress); } } Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt (original) +++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Jun 7 13:36:13 2013 @@ -1,5 +1,5 @@ org.apache.cxf.transport.http.HTTPTransportFactory::true -org.apache.cxf.transport.http.HTTPWSDLExtensionLoader::true +org.apache.cxf.transport.http.HTTPWSDLExtensionLoader::true:true org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder::true:true org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder::true:true org.apache.cxf.transport.http.policy.NoOpPolicyInterceptorProvider::true:true Modified: cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb?rev=1490642&r1=1490641&r2=1490642&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb (original) +++ cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb Fri Jun 7 13:36:13 2013 @@ -22,14 +22,6 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"; jaxb:extensionBindingPrefixes="xjc"> - <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; node="/xs:schema"> - <jaxb:schemaBindings> - <jaxb:package name="org.apache.cxf.wsdl"/> - </jaxb:schemaBindings> <jaxb:globalBindings generateIsSetMethod="true"/> - </jaxb:bindings> - <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; node="/xs:schema/xs:complexType[@name='tExtensibilityElement']"> - <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/> - </jaxb:bindings> </jaxb:bindings>
