cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1490642 [2/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/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java (from r1490629, cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.wsdl;
+package org.apache.cxf.ws.addressing;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -37,10 +37,6 @@ import java.util.concurrent.atomic.Atomi
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
 import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -67,11 +63,9 @@ import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.jaxb.JAXBContextCache;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.LSInputImpl;
 import org.apache.cxf.endpoint.EndpointResolverRegistry;
 import org.apache.cxf.endpoint.Server;
@@ -87,10 +81,6 @@ import org.apache.cxf.staxutils.StaxUtil
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MultiplexDestination;
-import org.apache.cxf.ws.addressing.AttributedURIType;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.ws.addressing.MetadataType;
 import org.apache.cxf.ws.addressing.wsdl.AttributedQNameType;
 import org.apache.cxf.ws.addressing.wsdl.ServiceNameType;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -235,7 +225,7 @@ public final class EndpointReferenceUtil
         }
     }
 
-    public static final String ANONYMOUS_ADDRESS = WSAEndpointReferenceUtils.ANONYMOUS_ADDRESS;
+    public static final String ANONYMOUS_ADDRESS = "http://www.w3.org/2005/08/addressing/anonymous";
     
     private static final Logger LOG = LogUtils.getL7dLogger(EndpointReferenceUtils.class);
 
@@ -270,9 +260,9 @@ public final class EndpointReferenceUtil
         = new AtomicReference<Reference<JAXBContext>>(new SoftReference<JAXBContext>(null));
     static {
         ADDRESSING_CLASSES.add(WSA_WSDL_OBJECT_FACTORY.getClass());
-        ADDRESSING_CLASSES.add(WSAEndpointReferenceUtils.WSA_OBJECT_FACTORY.getClass());
+        ADDRESSING_CLASSES.add(org.apache.cxf.ws.addressing.ObjectFactory.class);
     }
-    
+
     private EndpointReferenceUtils() {
         // Utility class - never constructed
     }
@@ -288,12 +278,22 @@ public final class EndpointReferenceUtil
                                              String portName) {
         if (null != serviceName) {
             JAXBElement<ServiceNameType> jaxbElement = getServiceNameType(serviceName, portName);
-            MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref);
+            MetadataType mt = getSetMetadata(ref);
 
             mt.getAny().add(jaxbElement);
         }
     }
     
+    
+    public static MetadataType getSetMetadata(EndpointReferenceType ref) {
+        MetadataType mt = ref.getMetadata();
+        if (null == mt) {
+            mt = new MetadataType();
+            ref.setMetadata(mt);
+        }
+        return mt;
+    }
+        
     public static JAXBElement<ServiceNameType> getServiceNameType(QName serviceName, String portName) {
         ServiceNameType serviceNameType = WSA_WSDL_OBJECT_FACTORY.createServiceNameType();
         serviceNameType.setValue(serviceName);
@@ -327,9 +327,6 @@ public final class EndpointReferenceUtil
                     String service = content;
                     if (content.contains(":")) {
                         namespaceURI = getNameSpaceUri(node, content, namespaceURI);
-                        if (StringUtils.isEmpty(namespaceURI)) {
-                            namespaceURI = findNamespaceHack(ref, bus);                                
-                        }
                         service = getService(content);
                     } else {
                         Node nodeAttr = node.getAttributes().getNamedItem("xmlns");
@@ -425,7 +422,7 @@ public final class EndpointReferenceUtil
             JAXBElement<AttributedQNameType> jaxbElement = 
                 WSA_WSDL_OBJECT_FACTORY.createInterfaceName(interfaceNameType);
 
-            MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref);
+            MetadataType mt = getSetMetadata(ref);
             mt.getAny().add(jaxbElement);
         }
     }
@@ -447,9 +444,6 @@ public final class EndpointReferenceUtil
                     //String service = content;
                     if (content.contains(":")) {
                         namespaceURI = getNameSpaceUri(node, content, namespaceURI);
-                        if (StringUtils.isEmpty(namespaceURI)) {
-                            namespaceURI = findNamespaceHack(ref, bus);                                
-                        }
                         content = getService(content);
                     } else {
                         Node nodeAttr = node.getAttributes().getNamedItem("xmlns");
@@ -471,37 +465,9 @@ public final class EndpointReferenceUtil
         return null;
     }
     
-    private static String findNamespaceHack(EndpointReferenceType ref, Bus bus) {
-        //probably a broken version of Xalan, we'll have to 
-        //try a hack to figure out the namespace as xalan
-        //dropped the namespace declaration so there isn't 
-        //a way to map the namespace prefix to the real namespace.
-        //This is fixed in xalan 2.7.1, but older versions may 
-        //be used
-        if (bus == null) {
-            return "";
-        }
-        String wsdlLocation = getWSDLLocation(ref);
-        if (StringUtils.isEmpty(wsdlLocation)) {
-            return "";
-        }
-        if (bus != null) {
-            WSDLManager manager = bus.getExtension(WSDLManager.class);
-            if (manager != null) {
-                try {
-                    Definition def = manager.getDefinition(wsdlLocation);
-                    return def.getTargetNamespace();
-                } catch (WSDLException e) {
-                    //ignore
-                }
-            }
-        }
-        return "";
-    }
-
     public static void setWSDLLocation(EndpointReferenceType ref, String... wsdlLocation) {
         
-        MetadataType metadata = WSAEndpointReferenceUtils.getSetMetadata(ref);
+        MetadataType metadata = getSetMetadata(ref);
 
         //wsdlLocation attribute is a list of anyURI.
         StringBuilder strBuf = new StringBuilder();
@@ -543,7 +509,7 @@ public final class EndpointReferenceUtil
         throws EndpointUtilsException {
         
         if (null != ref) {
-            MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref);
+            MetadataType mt = getSetMetadata(ref);
             List<Object> anyList = mt.getAny();
             try {
                 for (Source source : metadata) {
@@ -592,41 +558,6 @@ public final class EndpointReferenceUtil
             }
         }
     }
-   
-    /**
-     * Gets the WSDL definition for the provided endpoint reference.
-     * @param manager - the WSDL manager 
-     * @param ref - the endpoint reference
-     * @return Definition the wsdl definition
-     * @throws WSDLException
-     */
-    public static Definition getWSDLDefinition(WSDLManager manager, EndpointReferenceType ref)
-        throws WSDLException {
-
-        if (null == manager) {
-            return null;
-        }
-
-        MetadataType metadata = ref.getMetadata();
-        String location = getWSDLLocation(ref);
-
-        if (null != location) {
-            //Pick up the first url to obtain the wsdl defintion
-            return manager.getDefinition(location);
-        }
-
-        for (Object obj : metadata.getAny()) {
-            if (obj instanceof Element) {
-                Element el = (Element)obj;
-                if (StringUtils.isEqualUri(el.getNamespaceURI(), WSDLConstants.NS_WSDL11)
-                    && "definitions".equals(el.getLocalName())) {
-                    return manager.getDefinition(el);
-                }
-            }
-        }
-
-        return null;
-    }
     
     
     private static synchronized Schema createSchema(ServiceInfo serviceInfo, Bus b) {
@@ -748,98 +679,16 @@ public final class EndpointReferenceUtil
     
 
     /**
-     * Gets the WSDL port for the provided endpoint reference.
-     * @param manager - the WSDL manager 
-     * @param ref - the endpoint reference
-     * @return Port the wsdl port
-     * @throws WSDLException
-     */
-    public static Port getPort(WSDLManager manager, EndpointReferenceType ref) throws WSDLException {
-
-        Definition def = getWSDLDefinition(manager, ref);
-        if (def == null) {
-            throw new WSDLException(WSDLException.OTHER_ERROR, "unable to find definition for reference");
-        }
-
-        MetadataType metadata = ref.getMetadata();
-        for (Object obj : metadata.getAny()) {
-            
-            if (obj instanceof JAXBElement) {
-                Object jaxbVal = ((JAXBElement<?>)obj).getValue();
-
-                if (jaxbVal instanceof ServiceNameType) {
-                    Port port = null;
-                    ServiceNameType snt = (ServiceNameType)jaxbVal;
-                    if (LOG.isLoggable(Level.FINEST)) {
-                        LOG.log(Level.FINEST, "found service name " + snt.getValue().getLocalPart());
-                    }
-                    Service service = def.getService(snt.getValue());
-                    if (service == null) {
-                        LOG.log(Level.WARNING, "can't find the service name ["
-                                + snt.getValue()
-                                + "], using the default service name in wsdl");
-                        service = (Service)def.getServices().values().iterator().next();
-                        if (service == null) {
-                            return null;
-                        }
-                    }
-                    String endpoint = snt.getEndpointName();
-                    if ("".equals(endpoint) && service.getPorts().size() == 1) {
-                        port = (Port)service.getPorts().values().iterator().next();
-                    } else {
-                        port = service.getPort(endpoint);
-                    }
-                    // FIXME this needs to be looked at service.getPort(endpoint)
-                    //should not return null when endpoint is valid
-                    if (port == null) {
-                        LOG.log(Level.WARNING, "can't find the port name ["
-                                + endpoint
-                                + "], using the default port name in wsdl");
-                        port = (Port)service.getPorts().values().iterator().next();
-                    }
-                    return port;
-                }
-            }
-        }
-
-        if (def.getServices().size() == 1) {
-            Service service = (Service)def.getServices().values().iterator().next();
-            if (service.getPorts().size() == 1) { 
-                return (Port)service.getPorts().values().iterator().next();
-            }
-        }
-        
-        QName serviceName = getServiceName(ref, null);
-        if (null != serviceName) {
-            if (StringUtils.isEmpty(serviceName.getNamespaceURI())) {
-                serviceName = new QName(def.getTargetNamespace(), serviceName.getLocalPart());
-            }
-            Service service = def.getService(serviceName);
-            if (service == null) {
-                throw new WSDLException(WSDLException.OTHER_ERROR, "Cannot find service for " + serviceName);
-            }
-            if (service.getPorts().size() == 1) {
-                return (Port)service.getPorts().values().iterator().next();
-            }
-            String str = getPortName(ref);
-            LOG.log(Level.FINE, "getting port " + str + " from service " + service.getQName());
-            Port port = service.getPort(str);
-            if (port == null) {
-                throw new WSDLException(WSDLException.OTHER_ERROR, "unable to find port " + str);
-            }
-            return port;
-        }
-        // TODO : throw exception here
-        return null;
-    }
-
-    /**
      * Get the address from the provided endpoint reference.
      * @param ref - the endpoint reference
      * @return String the address of the endpoint
      */
     public static String getAddress(EndpointReferenceType ref) {
-        return WSAEndpointReferenceUtils.getAddress(ref);
+        AttributedURIType a = ref.getAddress();
+        if (null != a) {
+            return a.getValue();
+        }
+        return null;
     }
 
     /**
@@ -848,7 +697,9 @@ public final class EndpointReferenceUtil
      * @param address - the address
      */
     public static void setAddress(EndpointReferenceType ref, String address) {
-        WSAEndpointReferenceUtils.setAddress(ref, address);
+        AttributedURIType a = new AttributedURIType();
+        a.setValue(address);
+        ref.setAddress(a);
     }
     /**
      * Create an endpoint reference for the provided wsdl, service and portname.
@@ -860,8 +711,8 @@ public final class EndpointReferenceUtil
     public static EndpointReferenceType getEndpointReference(URL wsdlUrl, 
                                                              QName serviceName,
                                                              String portName) {
-        EndpointReferenceType reference = 
-            WSAEndpointReferenceUtils.createEndpointReferenceWithMetadata();
+        EndpointReferenceType reference = new EndpointReferenceType();
+        reference.setMetadata(new MetadataType());
         setServiceAndPortName(reference, serviceName, portName);
         //TODO To Ensure it is a valid URI syntax.
         setWSDLLocation(reference, wsdlUrl.toString());
@@ -876,8 +727,11 @@ public final class EndpointReferenceUtil
      * @return EndpointReferenceType - the duplicate endpoint reference
      */
     public static EndpointReferenceType duplicate(EndpointReferenceType ref) {
-
-        return WSAEndpointReferenceUtils.duplicate(ref);
+        EndpointReferenceType reference = new EndpointReferenceType();
+        reference.setMetadata(ref.getMetadata());
+        reference.getAny().addAll(ref.getAny());
+        reference.setAddress(ref.getAddress());
+        return reference;
     }
     
     /**
@@ -886,13 +740,15 @@ public final class EndpointReferenceUtil
      * @return EndpointReferenceType - the endpoint reference
      */
     public static EndpointReferenceType getEndpointReference(String address) {
-
-        return WSAEndpointReferenceUtils.getEndpointReference(address);
+        EndpointReferenceType reference = new EndpointReferenceType();
+        setAddress(reference, address);
+        return reference;
     }
     
     public static EndpointReferenceType getEndpointReference(AttributedURIType address) {
-
-        return WSAEndpointReferenceUtils.getEndpointReference(address);
+        EndpointReferenceType reference = new EndpointReferenceType();
+        reference.setAddress(address);
+        return reference;
     }    
     
     /**
@@ -900,8 +756,9 @@ public final class EndpointReferenceUtil
      * @return EndpointReferenceType - the endpoint reference
      */
     public static EndpointReferenceType getAnonymousEndpointReference() {
-        
-        return WSAEndpointReferenceUtils.getAnonymousEndpointReference();
+        EndpointReferenceType reference = new EndpointReferenceType();
+        setAddress(reference, ANONYMOUS_ADDRESS);
+        return reference;
     }
     
     /**

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java (from r1490629, cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.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.wsdl;
+package org.apache.cxf.ws.addressing;
 
 import org.apache.cxf.common.i18n.Exception;
 import org.apache.cxf.common.i18n.Message;

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java Fri Jun  7 13:36:13 2013
@@ -42,7 +42,6 @@ import org.apache.cxf.ws.addressing.v200
 import org.apache.cxf.ws.addressing.v200408.ObjectFactory;
 import org.apache.cxf.ws.addressing.v200408.Relationship;
 import org.apache.cxf.ws.addressing.v200408.ServiceNameType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 /**
  * This class is responsible for transforming between the native 

Modified: cxf/trunk/api/src/main/resources/schemas/wsdl/http.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/schemas/wsdl/http.xjb?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/resources/schemas/wsdl/http.xjb (original)
+++ cxf/trunk/api/src/main/resources/schemas/wsdl/http.xjb Fri Jun  7 13:36:13 2013
@@ -19,18 +19,7 @@
 -->
 <jaxb:bindings version="1.0" 
   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-  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>
+  xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <jaxb:bindings schemaLocation="http.xsd" node="/xs:schema">
         <jaxb:schemaBindings>
             <jaxb:package name="org.apache.cxf.wsdl.http"/>

Modified: cxf/trunk/api/src/main/resources/schemas/wsdl/http.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/schemas/wsdl/http.xsd?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/resources/schemas/wsdl/http.xsd (original)
+++ cxf/trunk/api/src/main/resources/schemas/wsdl/http.xsd Fri Jun  7 13:36:13 2013
@@ -35,44 +35,32 @@ No other rights are granted by implicati
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
 
-	<import namespace = "http://schemas.xmlsoap.org/wsdl/" 
-        schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
-
    	<element name="address" type="http:addressType"/>
 
    	<complexType name="addressType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-   			<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
+		<sequence/>
+		<attribute name="location" type="anyURI" use="required"/>
+        <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
    	</complexType>
 
    	<element name="binding" type="http:bindingType"/>
    	<complexType name="bindingType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-	      		<attribute name="verb" type="NMTOKEN" use="required"/>
-		</extension>
-		</complexContent>
+		<sequence/>
+   		<attribute name="verb" type="NMTOKEN" use="required"/>
+        <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
    	</complexType>
 
    	<element name="operation" type="http:operationType"/>
    	<complexType name="operationType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-	      		<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
+    	<sequence/>
+		<attribute name="location" type="anyURI" use="required"/>
+        <anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
 	</complexType>
 
    	<element name="urlEncoded">
-      		<complexType/>  		
+   		<complexType/>  		
    	</element>
    	<element name="urlReplacement">
-      		<complexType/>
-     	</element>
+   		<complexType/>
+   	</element>
 </schema>

Modified: cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb (original)
+++ cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb Fri Jun  7 13:36:13 2013
@@ -27,7 +27,4 @@
             <jaxb:package name="org.apache.cxf.ws.addressing.wsdl"/>
         </jaxb:schemaBindings>
     </jaxb:bindings>
-    <jaxb:bindings schemaLocation="ws-addr-wsdl.xsd" node="/xs:schema/xs:element[@name='UsingAddressing']">
-      <jaxb:class ref="org.apache.cxf.ws.addressing.wsdl.UsingAddressing"/>
-    </jaxb:bindings>
 </jaxb:bindings>

Modified: cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd (original)
+++ cxf/trunk/api/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd Fri Jun  7 13:36:13 2013
@@ -41,11 +41,11 @@
     
     <xs:attribute name="Action" type="xs:anyURI"/>
     
-    <xs:element name="UsingAddressing">
-        <xs:complexType>
-            <xs:anyAttribute namespace="##other" processContents="lax"/>
-        </xs:complexType>
-    </xs:element>
+    <xs:element name="UsingAddressing" type="tns:UsingAddressing"/>
+    <xs:complexType name="UsingAddressing">
+        <xs:sequence/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+    </xs:complexType>
     
     <xs:simpleType name="AnonymousType">
         <xs:restriction base="xs:token">

Modified: cxf/trunk/api/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java Fri Jun  7 13:36:13 2013
@@ -53,13 +53,4 @@ public class PropertiesLoaderUtilsTest e
 
     }
 
-    @Test
-    public void testGetPropertyNames() throws Exception {
-        Collection<String> names = PropertiesLoaderUtils.getPropertyNames(properties, soapBindingFactory);
-        assertNotNull(names);
-        assertEquals(3, names.size());
-        assertTrue(names.contains("http://schemas.xmlsoap.org/wsdl/soap/"));
-        assertTrue(names.contains("http://schemas.xmlsoap.org/wsdl/soap/http"));
-        assertTrue(names.contains("http://cxf.apache.org/transports/jms"));
-    }
 }

Copied: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java (from r1490629, cxf/trunk/api/src/main/java/org/apache/cxf/common/classloader/FireWallClassLoader.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java?p2=cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/common/classloader/FireWallClassLoader.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/classloader/FireWallClassLoader.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.common.classloader;
+package org.apache.cxf.jca.core.classloader;
 
 import java.security.SecureClassLoader;
 

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java Fri Jun  7 13:36:13 2013
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import org.apache.cxf.common.classloader.FireWallClassLoader;
 import org.apache.cxf.common.logging.LogUtils;
 
 

Copied: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java (from r1490629, cxf/trunk/api/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java?p2=cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java Fri Jun  7 13:36:13 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.common.classloader;
+package org.apache.cxf.jca.core.classloader;
 
 
 import java.io.File;

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Fri Jun  7 13:36:13 2013
@@ -61,21 +61,29 @@
     <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-specs</feature>
         <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
-		<bundle start-level='25' dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
+        <bundle start-level='25' dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
+
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-common/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-dom/${cxf.wss4j.version}</bundle>
+        <!--  NOT YET BUNDLES
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-policy/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-stax/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wss10/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wsu10/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wssc/${cxf.wss4j.version}</bundle>
+        -->
     </feature>
 
     <feature name="cxf-core" version="${project.version}" resolver='(obr)'>
         <feature version='${project.version}'>cxf-specs</feature>
 
         <bundle start-level='30' dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
-        <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
 
@@ -84,8 +92,13 @@
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle> 
         <bundle start-level='40'>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
     </feature>
+    <feature name="cxf-wsdl" version="${project.version}" resolver='(obr)'>
+        <feature version='${project.version}'>cxf-core</feature>
+        <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-wsdl/${project.version}</bundle>
+    </feature>
     <feature name="cxf-ws-policy" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <bundle start-level='30' dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
     </feature>
@@ -116,6 +129,7 @@
     </feature>
     <feature name="cxf-rt-security" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-security/${project.version}</bundle>
     </feature>
@@ -131,9 +145,9 @@
     </feature>
     <feature name="cxf-http-async" version="${project.version}" resolver='(obr)'>
         <feature version="[3,4)">cxf-http</feature>
-        <bundle start-level='40'> mvn:org.apache.httpcomponents/httpcore-osgi/${cxf.httpcomponents.core.version}</bundle>
-        <bundle start-level='40'> mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.version}</bundle>
-        <bundle start-level='40'> mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.httpcomponents/httpcore-osgi/${cxf.httpcomponents.core.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.version}</bundle>
+        <bundle start-level='40'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-hc/${project.version}</bundle>
     </feature>
     <feature name="cxf-http-netty-client" version="${project.version}" resolver='(obr)'>
@@ -143,17 +157,16 @@
     </feature>
     <feature name="cxf-http-netty-server" version="${project.version}" resolver='(obr)'>
          <feature version="[3,4)">cxf-http</feature>
-         <bundle start-level='40'> mvn:io.netty/netty/${cxf.netty.version}</bund
-le>
+         <bundle start-level='40'> mvn:io.netty/netty/${cxf.netty.version}</bundle>
          <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-netty-server/${project.version}</bundle>
     </feature>
     <feature name="cxf-bindings-soap" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle>
     </feature>
     <feature name="cxf-jaxws" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <feature version="${project.version}">cxf-databinding-jaxb</feature>
         <feature version="${project.version}">cxf-bindings-soap</feature>
         <feature version="${project.version}">cxf-http</feature>
@@ -167,7 +180,6 @@ le>
 
         <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
 
-        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
@@ -204,7 +216,7 @@ le>
     </feature>
 
     <feature name="cxf-databinding-aegis" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <feature version="${project.version}">cxf-bindings-soap</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle>
     </feature>
@@ -236,7 +248,7 @@ le>
     </feature>
 
     <feature name="cxf-bindings-corba" version="${project.version}" resolver='(obr)'>
-        <feature version="${project.version}">cxf-core</feature>
+        <feature version="${project.version}">cxf-wsdl</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle>
     </feature>
     <feature name="cxf-bindings-coloc" version="${project.version}" resolver='(obr)'>
@@ -285,7 +297,7 @@ le>
     </feature>
     <feature name="cxf-tools" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
-
+        <feature version="${project.version}">cxf-wsdl</feature>
         <feature version="${project.version}">cxf-databinding-jaxb</feature>
         <feature version="${project.version}">cxf-databinding-aegis</feature>
         <feature version="${project.version}">cxf-bindings-soap</feature>
@@ -334,14 +346,14 @@ le>
 
 
         <feature version="${project.version}">cxf-xjc-runtime</feature>
-        <feature version="${project.version}">cxf-ws-security</feature>
+        <!--feature version="${project.version}">cxf-ws-security</feature-->
         <feature version="${project.version}">cxf-ws-rm</feature>
         <feature version="${project.version}">cxf-ws-mex</feature>
         <feature version="${project.version}">cxf-javascript</feature>
         <feature version="${project.version}">cxf-frontend-javascript</feature>
         <feature version="${project.version}">cxf-features-clustering</feature>
         <!-- Compatibility bundle for the Require-Bundle use cases -->
-        <bundle start-level='50'>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle>
+        <!--bundle start-level='50'>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle-->
 
         <!-- tools really aren't needed in OSGi by default
         <feature version="${project.version}">cxf-tools</feature>

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java Fri Jun  7 13:36:13 2013
@@ -30,7 +30,6 @@ import java.util.Set;
 import javax.annotation.PostConstruct;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.corba.interceptors.CorbaStreamFaultInInterceptor;
 import org.apache.cxf.binding.corba.interceptors.CorbaStreamFaultOutInterceptor;
@@ -49,9 +48,10 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.wsdl.binding.AbstractWSDLBindingFactory;
 
 @NoJSR250Annotations(unlessNull = { "bus" })
-public class CorbaBindingFactory extends AbstractBindingFactory
+public class CorbaBindingFactory extends AbstractWSDLBindingFactory
     implements ConduitInitiator, DestinationFactory {
 
     public static final Collection<String> DEFAULT_NAMESPACES 

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java Fri Jun  7 13:36:13 2013
@@ -42,7 +42,7 @@ import org.apache.cxf.transport.MessageO
 import org.apache.cxf.transport.MultiplexDestination;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
 import org.omg.PortableServer.Current;

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Fri Jun  7 13:36:13 2013
@@ -63,6 +63,11 @@
             <artifactId>cxf-api</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>

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Fri Jun  7 13:36:13 2013
@@ -43,7 +43,6 @@ import javax.wsdl.extensions.mime.MIMEPa
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.binding.soap.interceptor.CheckFaultInterceptor;
@@ -108,13 +107,14 @@ import org.apache.cxf.ws.addressing.Addr
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.WSAddressingFeature;
 import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.binding.AbstractWSDLBindingFactory;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 
 import static org.apache.cxf.helpers.CastUtils.cast;
 
 
 @NoJSR250Annotations(unlessNull = { "bus" })
-public class SoapBindingFactory extends AbstractBindingFactory {
+public class SoapBindingFactory extends AbstractWSDLBindingFactory {
     public static final Collection<String> DEFAULT_NAMESPACES = Arrays.asList(
         "http://schemas.xmlsoap.org/soap/",
         "http://schemas.xmlsoap.org/wsdl/soap/",

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java Fri Jun  7 13:36:13 2013
@@ -57,7 +57,7 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceModelUtil;
 import org.apache.cxf.staxutils.W3CDOMStreamReader;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 /**
  * Perform databinding of the SOAP headers.

Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Fri Jun  7 13:36:13 2013
@@ -21,17 +21,22 @@ package org.apache.cxf.binding.soap.inte
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPFault;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import junit.framework.AssertionFailedError;
+
 import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapFault;
@@ -42,15 +47,33 @@ import org.apache.cxf.binding.soap.inter
 import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
 import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor.SAAJPreInInterceptor;
 import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.helpers.XPathUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.test.AbstractCXFTest;
+
+import org.junit.Assert;
 import org.junit.Test;
 
-public class SoapFaultSerializerTest extends AbstractCXFTest {
+public class SoapFaultSerializerTest extends Assert {
+    private void assertValid(String xpathExpression, Document doc) {
+        Map<String, String> namespaces = new HashMap<String, String>();
+        namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
+        namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema");
+        namespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+        namespaces.put("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
+        namespaces.put("soap", "http://schemas.xmlsoap.org/soap/");
+        namespaces.put("soap12env", "http://www.w3.org/2003/05/soap-envelope");
+        namespaces.put("xml", "http://www.w3.org/XML/1998/namespace");
+        XPathUtils xpu = new XPathUtils(namespaces);
+        if (!xpu.isExist(xpathExpression, doc, XPathConstants.NODE)) {
+            throw new AssertionFailedError("Failed to select any nodes for expression:\n" + xpathExpression
+                                           + " from document:\n" + XMLUtils.toString(doc));
+        }
+    }
     
     @Test
     public void testSoap11Out() throws Exception {
@@ -200,7 +223,6 @@ public class SoapFaultSerializerTest ext
         assertEquals(fault.getMessage(), fault2.getMessage());        
         assertEquals(fault.getSubCodes(), fault2.getSubCodes());
     }
-
     @Test
     public void testFaultToSoapFault() throws Exception {
         Exception ex = new Exception();

Modified: cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ cxf/trunk/rt/bindings/xml/pom.xml Fri Jun  7 13:36:13 2013
@@ -73,7 +73,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Fri Jun  7 13:36:13 2013
@@ -23,7 +23,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.wsdl.extensions.ExtensibilityElement;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
@@ -76,9 +75,9 @@ public class XMLFormatValidator extends 
             if (needRootNode) {
                 String path = "Binding(" + binding.getName().getLocalPart()
                     + "):BindingOperation(" + bo.getName() + ")";
-                List<ExtensibilityElement> inExtensors =
-                    bo.getInput().getExtensors(ExtensibilityElement.class);
-                Iterator<ExtensibilityElement> itIn = null;
+                List<XMLBindingMessageFormat> inExtensors =
+                    bo.getInput().getExtensors(XMLBindingMessageFormat.class);
+                Iterator<XMLBindingMessageFormat> itIn = null;
                 if (inExtensors != null) {
                     itIn = inExtensors.iterator();
                 }
@@ -93,9 +92,9 @@ public class XMLFormatValidator extends 
                         needRootNode = true;
                     }
                     if (needRootNode) {
-                        List<ExtensibilityElement> outExtensors =
-                            bo.getOutput().getExtensors(ExtensibilityElement.class);
-                        Iterator<ExtensibilityElement> itOut = null;
+                        List<XMLBindingMessageFormat> outExtensors =
+                            bo.getOutput().getExtensors(XMLBindingMessageFormat.class);
+                        Iterator<XMLBindingMessageFormat> itOut = null;
                         if (outExtensors != null) {
                             itOut = outExtensors.iterator();
                         }
@@ -111,20 +110,17 @@ public class XMLFormatValidator extends 
         return true;
     }
 
-    private boolean findXMLFormatRootNode(Iterator<ExtensibilityElement> it, 
+    private boolean findXMLFormatRootNode(Iterator<XMLBindingMessageFormat> it, 
                                           BindingOperationInfo bo,
                                           String errorPath) {
         while (it != null && it.hasNext()) {
-            ExtensibilityElement ext = it.next();
-            if (ext instanceof XMLBindingMessageFormat) {
-                XMLBindingMessageFormat xmlFormat = (XMLBindingMessageFormat)ext;
-                if (xmlFormat.getRootNode() == null) {
-                    QName rootNodeName = bo.getName();
-                    addErrorMessage(errorPath
-                                    + ": empty value of rootNode attribute, the value should be "
-                                    + rootNodeName);
-                    return false;                    
-                }
+            XMLBindingMessageFormat xmlFormat = it.next();
+            if (xmlFormat.getRootNode() == null) {
+                QName rootNodeName = bo.getName();
+                addErrorMessage(errorPath
+                                + ": empty value of rootNode attribute, the value should be "
+                                + rootNodeName);
+                return false;                    
             }
         }
         return true;

Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java Fri Jun  7 13:36:13 2013
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBException;
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.TExtensibilityElementImpl;
 import org.apache.cxf.wsdl.WSDLExtensionLoader;
 import org.apache.cxf.wsdl.WSDLManager;
 
@@ -53,7 +52,7 @@ public final class XMLWSDLExtensionLoade
     
     public static void createExtensor(WSDLManager manager,
                                 Class<?> parentType,
-                                Class<? extends TExtensibilityElementImpl> elementType) {
+                                Class<?> elementType) {
         try {
             JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
                                               parentType, 

Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java Fri Jun  7 13:36:13 2013
@@ -24,18 +24,12 @@ import javax.wsdl.Binding;
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
 
-import org.apache.cxf.bindings.xformat.XMLFormatBinding;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.wsdl.AbstractWSDLPlugin;
 
 public final class XmlBindingPlugin extends AbstractWSDLPlugin {
 
     public ExtensibilityElement createExtension(final Map<String, Object> args) throws WSDLException {
-        XMLFormatBinding xmlBinding = null;
-
-        xmlBinding = (XMLFormatBinding)registry.createExtension(Binding.class,
-                                                                ToolConstants.XML_BINDING_FORMAT);
-
-        return xmlBinding;
+        return registry.createExtension(Binding.class, ToolConstants.XML_BINDING_FORMAT);
     }
 }

Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java Fri Jun  7 13:36:13 2013
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.wsdl.AbstractWSDLPlugin;
+import org.apache.cxf.wsdl.JAXBExtensibilityElement;
 
 public final class XmlIoPlugin extends AbstractWSDLPlugin {
 
@@ -36,8 +37,13 @@ public final class XmlIoPlugin extends A
         Class<?> clz = getOption(args, Class.class);
         QName qname = getOption(args, QName.class);
 
-        xmlFormat = (XMLBindingMessageFormat)registry.createExtension(clz, ToolConstants.XML_FORMAT);
+        ExtensibilityElement ext = registry.createExtension(clz, ToolConstants.XML_FORMAT);
+        if (ext instanceof JAXBExtensibilityElement) {
+            xmlFormat = (XMLBindingMessageFormat)((JAXBExtensibilityElement)ext).getValue();
+        } else {
+            xmlFormat = (XMLBindingMessageFormat)ext;
+        }
         xmlFormat.setRootNode(qname);
-        return xmlFormat;
+        return ext;
     }
 }

Modified: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Jun  7 13:36:13 2013
@@ -1,3 +1,3 @@
 org.apache.cxf.binding.xml.XMLBindingFactory::true
-org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader::true
+org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader::true:true
 

Modified: cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb (original)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb Fri Jun  7 13:36:13 2013
@@ -22,13 +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:globalBindings generateIsSetMethod="true"/>
+
 </jaxb:bindings>

Modified: cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd (original)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd Fri Jun  7 13:36:13 2013
@@ -24,30 +24,22 @@
 	elementFormDefault="qualified"
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
 
-	<xs:import namespace="http://schemas.xmlsoap.org/wsdl/" 
-        schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" />
-
 	<xs:complexType name="XMLBindingMessageFormat">
-		<xs:complexContent>
-			<xs:extension base="wsdl:tExtensibilityElement">
-				<xs:sequence />
-				<xs:attribute name="rootNode" type="xs:QName"
-					use="optional">
-					<xs:annotation>
-						<xs:documentation>Specifies the QName of the root element used to wrap the message passed across the wire</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
+    
+		<xs:sequence />
+		<xs:attribute name="rootNode" type="xs:QName"
+			use="optional">
+			<xs:annotation>
+				<xs:documentation>Specifies the QName of the root element used to wrap the message passed across the wire</xs:documentation>
+			</xs:annotation>
+        </xs:attribute>
+        <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
 	</xs:complexType>
 
 	
 	<xs:complexType name="XMLFormatBinding">
-		<xs:complexContent>
-			<xs:extension base="wsdl:tExtensibilityElement">
-				<xs:sequence />
-			</xs:extension>
-		</xs:complexContent>
+ 		<xs:sequence />
+        <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
 	</xs:complexType>
 
 	<xs:element name="body" type="xformat:XMLBindingMessageFormat">

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java Fri Jun  7 13:36:13 2013
@@ -165,11 +165,7 @@ public class ExtensionManagerBus extends
         if (null == this.getExtension(BindingFactoryManager.class)) {
             new BindingFactoryManagerImpl(this);
         }
-        extensionManager.load(new String[] {
-            ExtensionManagerImpl.BUS_EXTENSION_RESOURCE,
-            ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_XML,
-            ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_OLD_XML});
-        
+        extensionManager.load(new String[] {ExtensionManagerImpl.BUS_EXTENSION_RESOURCE});
         extensionManager.activateAllByType(ResourceResolver.class);
         
         extensions.put(ExtensionManager.class, extensionManager);        

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Fri Jun  7 13:36:13 2013
@@ -29,7 +29,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
@@ -49,8 +48,6 @@ public class ExtensionManagerImpl implem
     public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
     public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
     public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME = "setActivationNamespaces";
-    public static final String BUS_EXTENSION_RESOURCE_XML = "META-INF/cxf/bus-extensions.xml";
-    public static final String BUS_EXTENSION_RESOURCE_OLD_XML = "bus-extensions.xml";
     public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.txt";
     
     private final ClassLoader loader;
@@ -61,8 +58,7 @@ public class ExtensionManagerImpl implem
 
     public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions, 
                                 ResourceManager rm, Bus b) {
-        this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_XML,
-                           BUS_EXTENSION_RESOURCE_OLD_XML},
+        this(new String[] {BUS_EXTENSION_RESOURCE},
                  cl, initialExtensions, rm, b);
     }
     public ExtensionManagerImpl(String resource, 
@@ -153,7 +149,6 @@ public class ExtensionManagerImpl implem
         }
         load(resource, loader);
     }
-    @SuppressWarnings("deprecation")
     final synchronized void load(String resource, ClassLoader l) throws IOException {
         
         Enumeration<URL> urls = l.getResources(resource);
@@ -162,14 +157,7 @@ public class ExtensionManagerImpl implem
             URL url = urls.nextElement();
             InputStream is = url.openStream();
             try {
-                List<Extension> exts;
-                if (resource.endsWith("xml")) {
-                    LOG.log(Level.WARNING, "DEPRECATED_EXTENSIONS", 
-                            new Object[] {resource, url, BUS_EXTENSION_RESOURCE});
-                    exts = new XmlExtensionFragmentParser().getExtensions(is);
-                } else {
-                    exts = new TextExtensionFragmentParser().getExtensions(is);
-                }
+                List<Extension> exts = new TextExtensionFragmentParser().getExtensions(is);
                 for (Extension e : exts) {
                     if (loader != l) {
                         e.classloader = l;

Modified: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Fri Jun  7 13:36:13 2013
@@ -1,5 +1,3 @@
-org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
-org.apache.cxf.wsdl11.WSDLServiceFactoryImpl:org.apache.cxf.wsdl.WSDLServiceFactory:true
 org.apache.cxf.bus.managers.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
 org.apache.cxf.bus.managers.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
 org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true   	   
@@ -7,9 +5,9 @@ org.apache.cxf.bus.managers.ServerRegist
 org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true 
 org.apache.cxf.bus.managers.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
 org.apache.cxf.bus.managers.HeaderManagerImpl:org.apache.cxf.headers.HeaderManager:true
-org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
 org.apache.cxf.service.factory.FactoryBeanListenerManager::true
 org.apache.cxf.bus.managers.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
 org.apache.cxf.bus.managers.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true
 org.apache.cxf.bus.resource.ResourceManagerImpl:org.apache.cxf.resource.ResourceManager:true
+org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
 

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Fri Jun  7 13:36:13 2013
@@ -32,7 +32,6 @@ import org.apache.cxf.management.Instrum
 import org.apache.cxf.phase.PhaseManager;
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.wsdl.WSDLManager;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.Assert;
@@ -47,7 +46,6 @@ public class CXFBusImplTest extends Asse
         assertNotNull(bus.getExtension(BindingFactoryManager.class));
         assertNotNull(bus.getExtension(ConduitInitiatorManager.class));   
         assertNotNull(bus.getExtension(DestinationFactoryManager.class));
-        assertNotNull(bus.getExtension(WSDLManager.class));
         assertNotNull(bus.getExtension(PhaseManager.class));
     }
     
@@ -56,7 +54,6 @@ public class CXFBusImplTest extends Asse
         
         IMocksControl control;
         BindingFactoryManager bindingFactoryManager;
-        WSDLManager wsdlManager;
         InstrumentationManager instrumentationManager;
         PhaseManager phaseManager;
         
@@ -64,19 +61,16 @@ public class CXFBusImplTest extends Asse
         
         Map<Class<?>, Object> extensions = new HashMap<Class<?>, Object>();
         bindingFactoryManager = control.createMock(BindingFactoryManager.class);
-        wsdlManager = control.createMock(WSDLManager.class);
         instrumentationManager = control.createMock(InstrumentationManager.class);
         phaseManager = control.createMock(PhaseManager.class);
         
         extensions.put(BindingFactoryManager.class, bindingFactoryManager);
-        extensions.put(WSDLManager.class, wsdlManager);
         extensions.put(InstrumentationManager.class, instrumentationManager);
         extensions.put(PhaseManager.class, phaseManager);
         
         Bus bus = new ExtensionManagerBus(extensions);
         
         assertSame(bindingFactoryManager, bus.getExtension(BindingFactoryManager.class));
-        assertSame(wsdlManager, bus.getExtension(WSDLManager.class));
         assertSame(instrumentationManager, bus.getExtension(InstrumentationManager.class));
         assertSame(phaseManager, bus.getExtension(PhaseManager.class));
   

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Fri Jun  7 13:36:13 2013
@@ -48,7 +48,6 @@ import org.apache.cxf.resource.ResourceM
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.workqueue.WorkQueueManager;
-import org.apache.cxf.wsdl.WSDLManager;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
@@ -71,7 +70,6 @@ public class SpringBusFactoryTest extend
         assertNotNull("No resource manager", bus.getExtension(ResourceManager.class));
         assertNotNull("No destination factory manager", bus.getExtension(DestinationFactoryManager.class));
         assertNotNull("No conduit initiator manager", bus.getExtension(ConduitInitiatorManager.class));
-        assertNotNull("No wsdl manager", bus.getExtension(WSDLManager.class));
         assertNotNull("No phase manager", bus.getExtension(PhaseManager.class));
         assertNotNull("No workqueue manager", bus.getExtension(WorkQueueManager.class));
         assertNotNull("No lifecycle manager", bus.getExtension(BusLifeCycleManager.class));

Modified: cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ cxf/trunk/rt/databinding/aegis/pom.xml Fri Jun  7 13:36:13 2013
@@ -57,6 +57,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -19,7 +19,7 @@
 package org.apache.cxf.aegis.databinding;
 
 import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
 /**
  * Obsolete copy of {@link XFireCompatibilityServiceConfiguration}.
  * @deprecated 2.1

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java Fri Jun  7 13:36:13 2013
@@ -19,7 +19,7 @@
 package org.apache.cxf.aegis.databinding;
 
 import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
 
 /**
  * This service configuration uses XFire-compatible conventions for assigning namespace URI's to Java packages

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java Fri Jun  7 13:36:13 2013
@@ -29,8 +29,9 @@ import org.apache.cxf.frontend.ClientPro
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.invoker.BeanInvoker;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+
 import org.junit.Before;
 import org.junit.Test;
 

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java Fri Jun  7 13:36:13 2013
@@ -33,7 +33,7 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireXmlParamTypeTest.java Fri Jun  7 13:36:13 2013
@@ -36,7 +36,6 @@ public class XFireXmlParamTypeTest exten
     private DefaultTypeMapping tm;
     private Java5TypeCreator creator;
 
-    @SuppressWarnings("deprecation")
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -44,7 +43,7 @@ public class XFireXmlParamTypeTest exten
         tm = new DefaultTypeMapping(null, DefaultTypeMapping.createDefaultTypeMapping(false, false));
         creator = new Java5TypeCreator();
         creator.setNextCreator(new DefaultTypeCreator());
-        creator.setConfiguration(new org.apache.cxf.aegis.type.Configuration());
+        creator.setConfiguration(new org.apache.cxf.aegis.type.TypeCreationOptions());
         tm.setTypeCreator(creator);
     }
 

Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Fri Jun  7 13:36:13 2013
@@ -112,6 +112,13 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Fri Jun  7 13:36:13 2013
@@ -83,7 +83,6 @@ import org.apache.cxf.jaxb.io.DataWriter
 import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.URIResolver;
 import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.staxutils.StaxUtils;
@@ -221,11 +220,10 @@ public class JAXBDataBinding extends Abs
         contextClasses.addAll(Arrays.asList(classes));
         setContext(createJAXBContext(contextClasses)); //NOPMD - specifically allow this
     }
-    public JAXBDataBinding(ReflectionServiceFactoryBean b) throws JAXBException {
-        this(b.isQualifyWrapperSchema());
-        Map<String, Object> props = b.getProperties();
+    public JAXBDataBinding(boolean qualified, Map<String, Object> props) throws JAXBException {
+        this(qualified);
         if (props != null && props.get("jaxb.additionalContextClasses") != null) {
-            Object o = b.getProperties().get("jaxb.additionalContextClasses");
+            Object o = props.get("jaxb.additionalContextClasses");
             if (o instanceof Class) {
                 o = new Class[] {(Class<?>)o};
             }

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri Jun  7 13:36:13 2013
@@ -87,17 +87,6 @@
                 <groupId>javax.annotation</groupId>
                 <artifactId>javax.annotation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-rt-bindings-xml</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-databinding-jaxb</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>

Added: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java?rev=1490642&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java Fri Jun  7 13:36:13 2013
@@ -0,0 +1,62 @@
+/**
+ * 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;
+
+import org.apache.cxf.binding.Binding;
+import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.model.BindingInfo;
+
+public class JAXRSBinding extends AbstractBasicInterceptorProvider implements Binding {
+    
+    private BindingInfo bindingInfo;
+    
+    public JAXRSBinding(BindingInfo bindingInfo) {
+        super();
+        this.bindingInfo = bindingInfo;
+    }
+
+    public BindingInfo getBindingInfo() {
+        return bindingInfo;
+    }
+
+    public org.apache.cxf.message.Message createMessage() {
+        return createMessage(new MessageImpl());
+    }
+
+    public org.apache.cxf.message.Message createMessage(org.apache.cxf.message.Message m) {
+        if (!m.containsKey(org.apache.cxf.message.Message.CONTENT_TYPE)) {
+            
+            String ct = null;
+            
+            // Should this be done in ServiceInvokerInterceptor to support a case where the 
+            // response content type is detected early on the inbound chain for all the bindings ?
+            Exchange exchange = m.getExchange();
+            if (exchange != null) {
+                ct = (String)exchange.get(org.apache.cxf.message.Message.CONTENT_TYPE);
+            }
+            if (ct == null) {
+                ct = "text/xml";
+            }
+            m.put(org.apache.cxf.message.Message.CONTENT_TYPE, ct);
+        }
+        return m;
+    }
+}
\ No newline at end of file

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java Fri Jun  7 13:36:13 2013
@@ -24,15 +24,14 @@ import java.util.logging.Logger;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.binding.AbstractBaseBindingFactory;
+import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
-import org.apache.cxf.binding.xml.XMLBinding;
-import org.apache.cxf.binding.xml.interceptor.XMLFaultOutInterceptor;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.StaxOutInterceptor;
+import org.apache.cxf.jaxrs.interceptor.JAXBDefaultFaultOutInterceptor;
 import org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor;
 import org.apache.cxf.jaxrs.interceptor.JAXRSOutInterceptor;
 import org.apache.cxf.service.Service;
@@ -45,7 +44,7 @@ import org.apache.cxf.transport.Destinat
  * CXF JAX-RS interceptors with the runtime.
  */
 @NoJSR250Annotations(unlessNull = { "bus" })
-public class JAXRSBindingFactory extends AbstractBaseBindingFactory {
+public class JAXRSBindingFactory extends AbstractBindingFactory {
     public static final String JAXRS_BINDING_ID = "http://apache.org/cxf/binding/jaxrs";
     
     private static final Logger LOG = LogUtils.getL7dLogger(JAXRSBindingFactory.class);
@@ -58,17 +57,19 @@ public class JAXRSBindingFactory extends
     }
 
     public Binding createBinding(BindingInfo bi) {
-        XMLBinding binding = new XMLBinding(bi);
+        JAXRSBinding binding = new JAXRSBinding(bi);
 
         binding.getInInterceptors().add(new JAXRSInInterceptor());
         
         binding.getOutInterceptors().add(new JAXRSOutInterceptor());
         
-        binding.getOutFaultInterceptors().add(new XMLFaultOutInterceptor());
+        binding.getOutFaultInterceptors().add(new JAXBDefaultFaultOutInterceptor());
         binding.getOutFaultInterceptors().add(new StaxOutInterceptor());
 
         return binding;
     }
+    
+    
 
     /*
      * The concept of Binding can not be applied to JAX-RS. Here we use



Mime
View raw message