cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1490642 [5/6] - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/common/classloader/ api/src/main/java/org/apache/cxf/common/jaxb/ api/src/main/java/org/apache/cxf/common/util/ api/src/main/jav...
Date Fri, 07 Jun 2013 13:36:19 GMT
Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java (from r1490629, cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.binding;
+package org.apache.cxf.wsdl.binding;
 
 import java.util.Collection;
 
@@ -31,6 +31,7 @@ import javax.wsdl.extensions.Extensibili
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.service.model.AbstractPropertiesHolder;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -38,21 +39,21 @@ import org.apache.cxf.service.model.Serv
 
 import static org.apache.cxf.helpers.CastUtils.cast;
 
-public abstract class AbstractBindingFactory extends AbstractBaseBindingFactory 
+public abstract class AbstractWSDLBindingFactory extends AbstractBindingFactory 
                       implements WSDLBindingFactory {
 
-    public AbstractBindingFactory() {
+    public AbstractWSDLBindingFactory() {
     }
     
-    public AbstractBindingFactory(Collection<String> ns) {
+    public AbstractWSDLBindingFactory(Collection<String> ns) {
         super(ns);
     }
     
-    public AbstractBindingFactory(Bus b) {
+    public AbstractWSDLBindingFactory(Bus b) {
         super(b);
     }
     
-    public AbstractBindingFactory(Bus b, Collection<String> ns) {
+    public AbstractWSDLBindingFactory(Bus b, Collection<String> ns) {
         super(b, ns);
     }
     

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java (from r1490629, cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java Fri Jun  7 13:36:13 2013
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package org.apache.cxf.binding;
+package org.apache.cxf.wsdl.binding;
 
 import javax.wsdl.Binding;
 
+import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.common.util.ParamReader;
 import org.apache.cxf.helpers.ServiceUtils;
 import org.apache.cxf.message.Exchange;
+import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
 
 import java.lang.reflect.Method;
 

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
@@ -91,6 +91,8 @@ import org.apache.cxf.service.Service;
 import org.apache.cxf.service.ServiceImpl;
 import org.apache.cxf.service.ServiceModelSchemaValidator;
 import org.apache.cxf.service.factory.FactoryBeanListener.Event;
+import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.factory.SimpleMethodDispatcher;
 import org.apache.cxf.service.invoker.FactoryInvoker;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.invoker.MethodDispatcher;
@@ -129,7 +131,7 @@ import org.apache.ws.commons.schema.util
  * will be filled in from the service class. If no WSDL URL is specified, the
  * Service will be constructed directly from the class structure.
  */
-public class ReflectionServiceFactoryBean extends AbstractServiceFactoryBean {
+public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory.AbstractServiceFactoryBean {
 
     public static final String ENDPOINT_CLASS = "endpoint.class";
     public static final String GENERIC_TYPE = "generic.type";
@@ -226,11 +228,11 @@ public class ReflectionServiceFactoryBea
                 cls = ((Class<?>)obj).asSubclass(DataBinding.class);
             }
             try {
-                return cls.getConstructor(ReflectionServiceFactoryBean.class)
-                    .newInstance(this);
+                return cls.getConstructor(Boolean.TYPE, Map.class)
+                    .newInstance(this.isQualifyWrapperSchema(), this.getProperties());
             } catch (NoSuchMethodException nsme) {
                 //ignore, use the no-arg constructor
-            }
+            }            
             return cls.newInstance();
         } catch (Exception e) {
             throw new ServiceConstructionException(e);

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
 
 import javax.wsdl.extensions.soap.SOAPBinding;
 

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java Fri Jun  7 13:36:13 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.catalog;
+package org.apache.cxf.wsdl11;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26,6 +26,8 @@ import javax.wsdl.xml.WSDLLocator;
 import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.catalog.OASISCatalogManager;
+import org.apache.cxf.catalog.OASISCatalogManagerHelper;
 import org.apache.cxf.resource.ExtendedURIResolver;
 import org.apache.cxf.transport.TransportURIResolver;
 

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java Fri Jun  7 13:36:13 2013
@@ -25,7 +25,6 @@ import javax.wsdl.xml.WSDLLocator;
 import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
 import org.apache.cxf.resource.ResourceManager;
 
 

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Fri Jun  7 13:36:13 2013
@@ -52,7 +52,6 @@ import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
 import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Fri Jun  7 13:36:13 2013
@@ -56,8 +56,8 @@ import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
+import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.BindingFactory;
-import org.apache.cxf.binding.WSDLBindingFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.helpers.CastUtils;
@@ -80,7 +80,9 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.service.model.UnwrappedOperationInfo;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.JAXBExtensibilityElement;
 import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.binding.WSDLBindingFactory;
 import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -133,8 +135,12 @@ public class WSDLServiceBuilder {
     private void copyExtensors(AbstractPropertiesHolder info, List<?> extList) {
         if (info != null) {
             for (ExtensibilityElement ext : cast(extList, ExtensibilityElement.class)) {
-                if (!info.containsExtensor(ext)) {
-                    info.addExtensor(ext);
+                Object o = ext;
+                if (ext instanceof JAXBExtensibilityElement) {
+                    o = ((JAXBExtensibilityElement)ext).getValue();
+                }
+                if (!info.containsExtensor(o)) {
+                    info.addExtensor(o);
                 }
             }
         }
@@ -488,7 +494,13 @@ public class WSDLServiceBuilder {
             copyExtensionAttributes(bi, binding);
         }
         if (bi == null) {
-            bi = new BindingInfo(service, ns.toString());
+            boolean onlyExtensors = false;
+            if (factory instanceof AbstractBindingFactory) {
+                bi = ((AbstractBindingFactory)factory).createBindingInfo(service, ns.toString(), null);
+                onlyExtensors = true;
+            } else {
+                bi = new BindingInfo(service, ns.toString());
+            }
             bi.setName(binding.getQName());
             copyExtensors(bi, binding.getExtensibilityElements());
             copyExtensionAttributes(bi, binding);
@@ -505,13 +517,21 @@ public class WSDLServiceBuilder {
                 if (bop.getBindingOutput() != null) {
                     outName = bop.getBindingOutput().getName();
                 }
-                BindingOperationInfo bop2 = bi.buildOperation(new QName(service.getName().getNamespaceURI(),
-                                                                        bop.getName()), inName, outName);
+                BindingOperationInfo bop2 = null;
+                if (onlyExtensors) {
+                    bop2 = bi.getOperation(new QName(binding.getQName().getNamespaceURI(),
+                                                       bop.getName()));
+                } else {
+                    bop2 = bi.buildOperation(new QName(binding.getQName().getNamespaceURI(),
+                                                       bop.getName()), inName, outName);
+                    if (bop2 != null) {
+                        bi.addOperation(bop2);
+                    }
+                }
                 if (bop2 != null) {
 
                     copyExtensors(bop2, bop.getExtensibilityElements());
                     copyExtensionAttributes(bop2, bop);
-                    bi.addOperation(bop2);
                     if (bop.getBindingInput() != null) {
                         copyExtensors(bop2.getInput(), bop.getBindingInput().getExtensibilityElements());
                         copyExtensionAttributes(bop2.getInput(), bop.getBindingInput());

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java (from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Added: cxf/trunk/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1490642&view=auto
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Jun  7 13:36:13 2013
@@ -0,0 +1,3 @@
+org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
+org.apache.cxf.wsdl11.WSDLServiceFactoryImpl:org.apache.cxf.wsdl.WSDLServiceFactory:true
+

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java (from r1490629, cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java (original)
+++ cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java Fri Jun  7 13:36:13 2013
@@ -1,76 +1,78 @@
-/**
- * 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.service.factory;
-
-import javax.wsdl.WSDLException;
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.wsdl.WSDLManager;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * 
- */
-public class ReflectionServiceFactorBeanTest extends Assert {
-    protected IMocksControl control;
-    
-    @Before
-    public void setUp() throws Exception {
-        control = EasyMock.createNiceControl();
-    }
-    
-    @After 
-    public void tearDown() throws Exception {
-        control.verify();
-    }
-    
-    @Test
-    public void testEmptyWsdlAndNoServiceClass() throws Exception {
-        final String dummyWsdl = "target/dummy.wsdl";
-        ReflectionServiceFactoryBean bean = new ReflectionServiceFactoryBean();
-        Bus bus = control.createMock(Bus.class);
-        
-        WSDLManager wsdlmanager = control.createMock(WSDLManager.class);
-        EasyMock.expect(bus.getExtension(WSDLManager.class)).andReturn(wsdlmanager);
-        EasyMock.expect(wsdlmanager.getDefinition(dummyWsdl))
-            .andThrow(new WSDLException("PARSER_ERROR", "Problem parsing '" + dummyWsdl + "'."));
-        EasyMock.expect(bus.getExtension(FactoryBeanListenerManager.class)).andReturn(null);
-        
-        control.replay();
-        
-        bean.setWsdlURL(dummyWsdl);
-        bean.setServiceName(new QName("http://cxf.apache.org/hello_world_soap_http", "GreeterService"));
-        bean.setBus(bus);
-        
-        try {
-            bean.create();
-            fail("no valid wsdl nor service class specified");
-        } catch (ServiceConstructionException e) {
-            // ignore
-        }
-    }
-}
+/**
+ * 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.wsdl.service.factory;
+
+import javax.wsdl.WSDLException;
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.service.factory.FactoryBeanListenerManager;
+import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class ReflectionServiceFactorBeanTest extends Assert {
+    protected IMocksControl control;
+    
+    @Before
+    public void setUp() throws Exception {
+        control = EasyMock.createNiceControl();
+    }
+    
+    @After 
+    public void tearDown() throws Exception {
+        control.verify();
+    }
+    
+    @Test
+    public void testEmptyWsdlAndNoServiceClass() throws Exception {
+        final String dummyWsdl = "target/dummy.wsdl";
+        ReflectionServiceFactoryBean bean = new ReflectionServiceFactoryBean();
+        Bus bus = control.createMock(Bus.class);
+        
+        WSDLManager wsdlmanager = control.createMock(WSDLManager.class);
+        EasyMock.expect(bus.getExtension(WSDLManager.class)).andReturn(wsdlmanager);
+        EasyMock.expect(wsdlmanager.getDefinition(dummyWsdl))
+            .andThrow(new WSDLException("PARSER_ERROR", "Problem parsing '" + dummyWsdl + "'."));
+        EasyMock.expect(bus.getExtension(FactoryBeanListenerManager.class)).andReturn(null);
+        
+        control.replay();
+        
+        bean.setWsdlURL(dummyWsdl);
+        bean.setServiceName(new QName("http://cxf.apache.org/hello_world_soap_http", "GreeterService"));
+        bean.setBus(bus);
+        
+        try {
+            bean.create();
+            fail("no valid wsdl nor service class specified");
+        } catch (ServiceConstructionException e) {
+            // ignore
+        }
+    }
+}

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?p2=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Fri Jun  7 13:36:13 2013
@@ -45,7 +45,6 @@ import org.w3c.dom.Node;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.helpers.CastUtils;
@@ -65,7 +64,7 @@ import org.apache.cxf.service.model.Sche
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;

Copied: cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs-Import.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs-Import.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs-Import.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs-Import.wsdl&p1=cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs-Import.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/DiffPortTypeNs.wsdl&p1=cxf/trunk/rt/core/src/test/resources/DiffPortTypeNs.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/folder with spaces/import_test.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/folder with spaces/import_test.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/folder%20with%20spaces/import_test.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/folder%20with%20spaces/import_test.wsdl&p1=cxf/trunk/rt/core/src/test/resources/folder%20with%20spaces/import_test.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/log4j.properties (from r1490629, cxf/trunk/api/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/log4j.properties?p2=cxf/trunk/rt/wsdl/src/test/resources/log4j.properties&p1=cxf/trunk/api/src/test/resources/log4j.properties&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/logging.properties (from r1490629, cxf/trunk/api/src/test/resources/logging.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/logging.properties?p2=cxf/trunk/rt/wsdl/src/test/resources/logging.properties&p1=cxf/trunk/api/src/test/resources/logging.properties&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bare.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bare.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bare.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bare.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bare.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_ext.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_ext.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_ext.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_ext.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_ext.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_local_nsdecl.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_local_nsdecl.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_local_nsdecl.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_local_nsdecl.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_local_nsdecl.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_multiporttype.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_multiporttype.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_multiporttype.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_multiporttype.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_multiporttype.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import_test.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import_test.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import_test.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import_test.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import_test.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/no_body_parts.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/no_body_parts.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/no_body_parts.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/no_body_parts.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/no_body_parts.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-binding.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-binding.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-binding.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-binding.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-binding.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-interfaces.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-interfaces.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-interfaces.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-interfaces.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-soap-interfaces.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-types.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-types.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-types.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-types.xsd&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl1/person-types.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl2/person.wsdl (from r1490629, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl2/person.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl2/person.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/org/apache/cxf/wsdl11/wsdl2/person.wsdl&p1=cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/wsdl2/person.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_In.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema1_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_Out.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema1_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_In.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema2_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_Out.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema2_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_In.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema3_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_Out.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema/folder with spaces/Schema3_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schema5.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema5.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schema5.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schema5.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema5.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/bar.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema5.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/bar.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/bar.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema5.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/resources/schema5.xsd (original)
+++ cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/bar.xsd Fri Jun  7 13:36:13 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -17,11 +17,21 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s5" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:RelPath" xmlns:RP="urn:RelPath"
+	elementFormDefault="qualified">
+	<xs:complexType name="RPTest1CT_In">
+		<xs:sequence>
+			<xs:element name="RPTest1_CT_String" type="xs:string">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
-  <xs:element name="sayHi">
-    <xs:complexType/>
-  </xs:element>
-
-</xs:schema>
+	<xs:complexType name="RPTest1CT_Out">
+		<xs:sequence>
+			<xs:element name="RPTest1_Ele_String" type="xs:string">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
+</xs:schema>
\ No newline at end of file

Copied: cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/folder with spaces/bar.xsd (from r1490629, cxf/trunk/rt/core/src/test/resources/schema5.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/folder%20with%20spaces/bar.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/folder%20with%20spaces/bar.xsd&p1=cxf/trunk/rt/core/src/test/resources/schema5.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/resources/schema5.xsd (original)
+++ cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/folder with spaces/bar.xsd Fri Jun  7 13:36:13 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -17,11 +17,21 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s5" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:RelPath" xmlns:RP="urn:RelPath"
+	elementFormDefault="qualified">
+	<xs:complexType name="RPTest1CT_In">
+		<xs:sequence>
+			<xs:element name="RPTest1_CT_String" type="xs:string">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
-  <xs:element name="sayHi">
-    <xs:complexType/>
-  </xs:element>
-
-</xs:schema>
+	<xs:complexType name="RPTest1CT_Out">
+		<xs:sequence>
+			<xs:element name="RPTest1_Ele_String" type="xs:string">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
+</xs:schema>
\ No newline at end of file

Added: cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/foo.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/foo.xsd?rev=1490642&view=auto
==============================================================================
--- cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/foo.xsd (added)
+++ cxf/trunk/rt/wsdl/src/test/resources/schemas/configuration/foo.xsd Fri Jun  7 13:36:13 2013
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/configuration/foo" targetNamespace="http://cxf.apache.org/configuration/foo" elementFormDefault="qualified">
+
+    <xs:complexType name="foo">        
+        <xs:sequence>
+            <xs:element name="position" type="tns:point" minOccurs="0"/>
+            <xs:element name="address" type="tns:address" minOccurs="0"/>
+            <xs:element name="name" type="xs:string" minOccurs="0"/>
+            <xs:element name="intDefault" type="xs:int" default="22" minOccurs="0"/>
+            <xs:element name="intNoDefault" type="xs:int" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="point">
+        <xs:sequence>
+            <xs:element name="x" type="xs:int"></xs:element>
+            <xs:element name="y" type="xs:int"></xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="address">
+        <xs:sequence>
+            <xs:element name="city" type="xs:string"></xs:element>
+            <xs:element name="zip" type="xs:int"></xs:element>
+            <xs:element name="street" type="xs:string"></xs:element>
+            <xs:element name="nr" type="xs:int" minOccurs="0"></xs:element>
+        </xs:sequence>
+    </xs:complexType> 
+    
+    <xs:element name="point" type="tns:point"/>
+    <xs:element name="address" type="tns:address"/>
+    <xs:element name="foo" type="tns:foo"/>   
+        
+</xs:schema>

Copied: cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xjb (from r1490629, cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xjb?p2=cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xjb&p1=cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xsd (from r1490629, cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xsd?p2=cxf/trunk/rt/wsdl/src/test/resources/schemas/wsdl/test-conf.xsd&p1=cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Added: cxf/trunk/rt/wsdl/src/test/resources/wsdl/folder with spaces/foo.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/wsdl/folder%20with%20spaces/foo.wsdl?rev=1490642&view=auto
==============================================================================
--- cxf/trunk/rt/wsdl/src/test/resources/wsdl/folder with spaces/foo.wsdl (added)
+++ cxf/trunk/rt/wsdl/src/test/resources/wsdl/folder with spaces/foo.wsdl Fri Jun  7 13:36:13 2013
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:tns="http://www.example.org/RelPathDocLit/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RelPathDocLit"
+	targetNamespace="http://www.example.org/RelPathDocLit/" xmlns:xsd1="urn:RelPath">
+	<wsdl:types>
+		<xsd:schema targetNamespace="http://www.example.org/RelPathDocLit/">
+			<xsd:element name="NewOperation">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="in" type="xsd:string" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="NewOperationResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="out" type="xsd:string" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:schema>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<xsd:import namespace="urn:RelPath" schemaLocation="../schemas/configuration/bar.xsd">
+			</xsd:import>
+		</xsd:schema>
+	</wsdl:types>
+	<wsdl:message name="RelPathOperationRequest">
+		<wsdl:part name="parameters" type="xsd1:RPTest1CT_In" />
+	</wsdl:message>
+	<wsdl:message name="RelPathOperationResponse">
+		<wsdl:part name="parameters" type="xsd1:RPTest1CT_Out" />
+	</wsdl:message>
+	<wsdl:portType name="RelPathDocLit">
+		<wsdl:operation name="RelPathOperation">
+			<wsdl:input message="tns:RelPathOperationRequest" />
+			<wsdl:output message="tns:RelPathOperationResponse" />
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="RelPathDocLitSOAP" type="tns:RelPathDocLit">
+		<soap:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name="RelPathOperation">
+			<soap:operation soapAction="http://www.example.org/RelPathDocLit/RelPathOperation" />
+			<wsdl:input>
+				<soap:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="RelPathDocLit">
+		<wsdl:port binding="tns:RelPathDocLitSOAP" name="RelPathDocLitSOAP">
+			<soap:address location="http://localhost:2580/process/RelPathDocLit" />
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>

Added: cxf/trunk/rt/wsdl/src/test/resources/wsdl/foo.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/wsdl/foo.wsdl?rev=1490642&view=auto
==============================================================================
--- cxf/trunk/rt/wsdl/src/test/resources/wsdl/foo.wsdl (added)
+++ cxf/trunk/rt/wsdl/src/test/resources/wsdl/foo.wsdl Fri Jun  7 13:36:13 2013
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:tns="http://www.example.org/RelPathDocLit/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RelPathDocLit"
+	targetNamespace="http://www.example.org/RelPathDocLit/" xmlns:xsd1="urn:RelPath">
+	<wsdl:types>
+		<xsd:schema targetNamespace="http://www.example.org/RelPathDocLit/">
+			<xsd:element name="NewOperation">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="in" type="xsd:string" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="NewOperationResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="out" type="xsd:string" />
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:schema>
+		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<xsd:import namespace="urn:RelPath" schemaLocation="../schemas/configuration/bar.xsd">
+			</xsd:import>
+		</xsd:schema>
+	</wsdl:types>
+	<wsdl:message name="RelPathOperationRequest">
+		<wsdl:part name="parameters" type="xsd1:RPTest1CT_In" />
+	</wsdl:message>
+	<wsdl:message name="RelPathOperationResponse">
+		<wsdl:part name="parameters" type="xsd1:RPTest1CT_Out" />
+	</wsdl:message>
+	<wsdl:portType name="RelPathDocLit">
+		<wsdl:operation name="RelPathOperation">
+			<wsdl:input message="tns:RelPathOperationRequest" />
+			<wsdl:output message="tns:RelPathOperationResponse" />
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="RelPathDocLitSOAP" type="tns:RelPathDocLit">
+		<soap:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name="RelPathOperation">
+			<soap:operation soapAction="http://www.example.org/RelPathDocLit/RelPathOperation" />
+			<wsdl:input>
+				<soap:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="RelPathDocLit">
+		<wsdl:port binding="tns:RelPathDocLitSOAP" name="RelPathDocLitSOAP">
+			<soap:address location="http://localhost:2580/process/RelPathDocLit" />
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>

Copied: cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext.wsdl (from r1490629, cxf/trunk/api/src/test/resources/wsdl/test_ext.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext.wsdl&p1=cxf/trunk/api/src/test/resources/wsdl/test_ext.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext_remapped.wsdl (from r1490629, cxf/trunk/api/src/test/resources/wsdl/test_ext_remapped.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext_remapped.wsdl?p2=cxf/trunk/rt/wsdl/src/test/resources/wsdl/test_ext_remapped.wsdl&p1=cxf/trunk/api/src/test/resources/wsdl/test_ext_remapped.wsdl&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java Fri Jun  7 13:36:13 2013
@@ -76,6 +76,7 @@ import org.apache.cxf.staxutils.StaxUtil
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.cxf.ws.addressing.VersionTransformer;
 import org.apache.cxf.ws.policy.EffectivePolicy;
 import org.apache.cxf.ws.policy.PolicyBuilder;
@@ -85,7 +86,6 @@ import org.apache.cxf.ws.security.Securi
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.trust.STSUtils;
 import org.apache.cxf.ws.security.trust.TrustException;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;

Modified: cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java (original)
+++ cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java Fri Jun  7 13:36:13 2013
@@ -57,6 +57,7 @@ import org.apache.cxf.ws.addressing.Addr
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 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.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.discovery.wsdl.AppSequenceType;
@@ -70,7 +71,6 @@ import org.apache.cxf.ws.discovery.wsdl.
 import org.apache.cxf.ws.discovery.wsdl.ResolveMatchesType;
 import org.apache.cxf.ws.discovery.wsdl.ResolveType;
 import org.apache.cxf.ws.discovery.wsdl.ScopesType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 /**
  * 

Modified: cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java (original)
+++ cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java Fri Jun  7 13:36:13 2013
@@ -65,6 +65,7 @@ import org.apache.cxf.ws.addressing.Addr
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.discovery.WSDVersion;
 import org.apache.cxf.ws.discovery.WSDiscoveryClient;
@@ -79,7 +80,6 @@ import org.apache.cxf.ws.discovery.wsdl.
 import org.apache.cxf.ws.discovery.wsdl.ResolveMatchesType;
 import org.apache.cxf.ws.discovery.wsdl.ResolveType;
 import org.apache.cxf.ws.discovery.wsdl.ScopesType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 public class WSDiscoveryServiceImpl implements WSDiscoveryService {
     Bus bus;

Modified: cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/mtomTestBeans.xml Fri Jun  7 13:36:13 2013
@@ -56,7 +56,7 @@ http://cxf.apache.org/core http://cxf.ap
 			<ref bean="mtomImpl" />
 		</simple:serviceBean>
 		<simple:serviceFactory>
-			<bean class='org.apache.cxf.service.factory.ReflectionServiceFactoryBean'>
+			<bean class='org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean'>
 				<property name="properties">
 					<map>
 						<entry key="mtom-enabled">
@@ -83,7 +83,7 @@ http://cxf.apache.org/core http://cxf.ap
 			<ref bean="mtomImpl" />
 		</simple:serviceBean>
 		<simple:serviceFactory>
-			<bean class='org.apache.cxf.service.factory.ReflectionServiceFactoryBean'>
+			<bean class='org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean'>
 				<property name="properties">
 					<map>
 						<entry key="mtom-enabled">

Modified: cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml Fri Jun  7 13:36:13 2013
@@ -57,13 +57,13 @@ http://cxf.apache.org/schemas/jaxws.xsd"
       <bean class="org.apache.cxf.authservice.AuthServiceImpl" />
     </simple:serviceBean>
     <simple:serviceFactory>
-    	<bean class="org.apache.cxf.service.factory.ReflectionServiceFactoryBean">
+    	<bean class="org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean">
     		<property name="serviceConfigurations">
     			<list>
     				<bean class="org.apache.cxf.aegis.databinding.AegisServiceConfiguration">
     					<property name="serviceNamespace" value="http://foo.bar.com"/>
     				</bean>
-    				<bean class="org.apache.cxf.service.factory.DefaultServiceConfiguration"/>
+    				<bean class="org.apache.cxf.wsdl.service.factory.DefaultServiceConfiguration"/>
     			</list>
     		</property>
     	</bean>

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java Fri Jun  7 13:36:13 2013
@@ -94,6 +94,7 @@ public class ClientServerXMLTest extends
         try {
             Greeter greeter = service.getPort(barePortName, Greeter.class);
             updateAddressPort(greeter, REG_PORT);
+
             String username = System.getProperty("user.name");
             String reply = greeter.greetMe(username);
 

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java Fri Jun  7 13:36:13 2013
@@ -32,11 +32,11 @@ import javax.xml.ws.WebServiceException;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
 import org.apache.cxf.catalog.OASISCatalogManager;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.CatalogWSDLLocator;
 import org.apache.cxf.wsdl11.WSDLManagerImpl;
 
 import org.apache.hello_world.Greeter;

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java Fri Jun  7 13:36:13 2013
@@ -29,12 +29,12 @@ import org.apache.cxf.jaxws.EndpointImpl
 import org.apache.cxf.jaxws.JAXWSMethodInvoker;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.ordered_param_holder.OrderedParamHolderImpl;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
 import org.apache.cxf.service.invoker.Factory;
 import org.apache.cxf.service.invoker.PerRequestFactory;
 import org.apache.cxf.service.invoker.PooledFactory;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
 
 
 public class ServerMisc extends AbstractBusTestServerBase {

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml Fri Jun  7 13:36:13 2013
@@ -26,7 +26,7 @@
 	<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding"
 		scope='prototype'>
 		<property name='configuration'>
-			<bean class='org.apache.cxf.aegis.type.Configuration'>
+			<bean class='org.apache.cxf.aegis.type.TypeCreationOptions'>
 				<property name='defaultMinOccurs' value='1' />
 				<property name='defaultNillable' value='false' />
 			</bean>

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java Fri Jun  7 13:36:13 2013
@@ -32,7 +32,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.common.jaxb.JAXBUtils;
 import org.apache.cxf.jaxws.spi.ProviderImpl;
 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.wsdl11.WSDLManagerImpl;
 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java Fri Jun  7 13:36:13 2013
@@ -27,7 +27,7 @@ import javax.xml.ws.wsaddressing.W3CEndp
 import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 @WebService(serviceName = "NumberFactoryService", 
             portName = "NumberFactoryPort", 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java Fri Jun  7 13:36:13 2013
@@ -24,7 +24,7 @@ import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.MessageContext;
 
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 @WebService(serviceName = "NumberService", 
             endpointInterface = "org.apache.cxf.factory_pattern.Number", 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java Fri Jun  7 13:36:13 2013
@@ -43,7 +43,7 @@ import org.apache.cxf.testutil.common.Ab
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 



Mime
View raw message