svn commit: r589876 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java

[dkulp]

Author: dkulp
Date: Mon Oct 29 14:52:34 2007
New Revision: 589876

URL: http://svn.apache.org/viewvc?rev=589876&view=rev
Log:
Merged revisions 589864 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r589864 | dkulp | 2007-10-29 17:32:46 -0400 (Mon, 29 Oct 2007) | 3 lines
  
  Remove unusable constructor (eclipse warning)
  Fix namespace for soap:header serializer registration
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java?rev=589876&r1=589875&r2=589876&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
 Mon Oct 29 14:52:34 2007
@@ -80,17 +80,28 @@
         try {
             wsdlFactory = WSDLFactory.newInstance();
             registry = wsdlFactory.newPopulatedExtensionRegistry();
-            QName header = new QName(WSDLConstants.WSDL11_NAMESPACE, "header");
+            QName header11 = new QName(WSDLConstants.SOAP11_NAMESPACE, 
"header");
+            QName header12 = new QName(WSDLConstants.SOAP12_NAMESPACE, 
"header");
             registry.registerDeserializer(MIMEPart.class,
-                                          header,
+                                          header11,
                                           new SOAPHeaderSerializer());
             registry.registerSerializer(MIMEPart.class,
-                                        header,
+                                        header11,
                                         new SOAPHeaderSerializer());
-            registry.mapExtensionTypes(MIMEPart.class, header, 
SOAPHeaderImpl.class);
+            registry.mapExtensionTypes(MIMEPart.class, header11, 
SOAPHeaderImpl.class);
+            registry.registerDeserializer(MIMEPart.class,
+                                          header12,
+                                          new SOAPHeaderSerializer());
+            registry.registerSerializer(MIMEPart.class,
+                                        header12,
+                                        new SOAPHeaderSerializer());
+            registry.mapExtensionTypes(MIMEPart.class, header12, 
SOAPHeaderImpl.class);
+            
 
             registerInitialExtensions();
             wsdlReader = wsdlFactory.newWSDLReader();
+            wsdlReader.setExtensionRegistry(registry);
+            
             // TODO enable the verbose if in verbose mode.
             wsdlReader.setFeature("javax.wsdl.verbose", false);
             wsdlReader.setFeature("javax.wsdl.importDocuments", true);