svn commit: r1050585 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description: WSDL11ToAxisServiceBuilder.java WSDL20ToAxisServiceBuilder.java WSDLToAxisServiceBuilder.java

[samisa]

Author: samisa
Date: Sat Dec 18 04:07:27 2010
New Revision: 1050585

URL: http://svn.apache.org/viewvc?rev=1050585&view=rev
Log:
Applied patch fixing Wrong order in http location table using WSDL 1.1 - 
AXIS2-4835

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 Sat Dec 18 04:07:27 2010
@@ -107,7 +107,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.Vector;
 
 public class WSDL11ToAxisServiceBuilder extends WSDLToAxisServiceBuilder {
@@ -634,7 +633,7 @@ public class WSDL11ToAxisServiceBuilder 
         AxisBindingOperation axisBindingOperation;
         BindingOperation wsdl4jBindingOperation;
 
-        Map httpLocationMap = new TreeMap();
+        Map httpLocationMap = createHttpLocationTable();
         String httpLocation = null;
 
         for (Iterator iterator = wsdl4jBidingOperations.iterator(); 
iterator.hasNext();) {

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
 Sat Dec 18 04:07:27 2010
@@ -756,13 +756,7 @@ public class WSDL20ToAxisServiceBuilder 
     private void processHTTPBindingExtention(Binding binding, AxisBinding 
axisBinding, Interface serviceInterface)
             throws AxisFault {
 
-
-        // Set a comparator so tha httpLocations are stored in decending order
-        Map httpLocationTable = new TreeMap(new Comparator(){
-            public int compare(Object o1, Object o2) {
-                return (-1 * ((Comparable)o1).compareTo(o2));
-            }
-        });
+        Map httpLocationTable = createHttpLocationTable();
         // Capture all the binding specific properties
 
         HTTPBindingExtensionsImpl httpBindingExtensions;

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
 Sat Dec 18 04:07:27 2010
@@ -33,9 +33,11 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.InputStream;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.TreeMap;
 
 public abstract class WSDLToAxisServiceBuilder {
 
@@ -303,4 +305,14 @@ public abstract class WSDLToAxisServiceB
     public void useAxisConfiguration(AxisConfiguration axisConfig) {
         this.axisConfig = axisConfig;
     }
+    
+    protected Map createHttpLocationTable() {
+       // Set a comparator so the httpLocations are stored in decending order
+       Map httpLocationTable = new TreeMap(new Comparator(){
+          public int compare(Object o1, Object o2) {
+             return (-1 * ((Comparable)o1).compareTo(o2));
+          }
+       });
+       return httpLocationTable;
+    }
 }