svn commit: r589864 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java

[dkulp]

Author: dkulp
Date: Mon Oct 29 14:32:46 2007
New Revision: 589864

URL: http://svn.apache.org/viewvc?rev=589864&view=rev
Log:
Remove unusable constructor (eclipse warning)
Fix namespace for soap:header serializer registration

Modified:
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
    
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java?rev=589864&r1=589863&r2=589864&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
 Mon Oct 29 14:32:46 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);

Modified: 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java?rev=589864&r1=589863&r2=589864&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
 Mon Oct 29 14:32:46 2007
@@ -31,14 +31,14 @@
     /**
      * Regex for sub-resource: For each resource class compute a regular
      * expression from its URI template, If the resource class has 
sub-resources
-     * then append ¡®(/.*)?¡¯ to the resulting regular expression.
+     * then append (/.*)? to the resulting regular expression.
      */
     public static final String SUB_RESOURCE_REGEX_SUFFIX = "(/.*)?";
 
     /**
      * Regex for none sub-resource: For each resource class compute a regular
      * expression from its URI template, If the resource class has no
-     * sub-resources then append ¡®(/)?¡¯ to the resulting regular expression.
+     * sub-resources then append (/)? to the resulting regular expression.
      */
     public static final String NONE_SUB_RESOURCE_REGEX_SUFFIX = "(/)?";
     
@@ -49,7 +49,7 @@
 
     /**
      * A URI template is converted into a regular expression by substituting
-     * ¡®(.*?)¡¯ for each occurrence of {\([w- 14 \. ]+?\)} within the URL
+     * (.*?) for each occurrence of {\([w- 14 \. ]+?\)} within the URL
      * template
      */
     private static final String URITEMPLATE_REGEX = "(.*?)";
@@ -60,15 +60,6 @@
     private final List<String> templateVariables;
     private final String templateRegex;
     private final Pattern templateRegexPattern;
-
-    private URITemplate() {
-        this.template = "";
-        this.regexSuffix = null;
-        this.endsWithSlash = false;
-        this.templateVariables = Collections.emptyList();
-        this.templateRegex = "";
-        this.templateRegexPattern = null;
-    }
 
     public URITemplate(String theTemplate) {
         this(theTemplate, null);