svn commit: r1242263 - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java

[ema]

Author: ema
Date: Thu Feb  9 10:24:58 2012
New Revision: 1242263

URL: http://svn.apache.org/viewvc?rev=1242263&view=rev
Log:
[CXF-4095]:schemaLocation attribute for swaRef namespace 
http://ws-i.org/profiles/basic/1.1/xsd is wrongly removed

Modified:
    
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
    
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=1242263&r1=1242262&r2=1242263&view=diff
==============================================================================
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Thu Feb  9 10:24:58 2012
@@ -54,6 +54,8 @@ public abstract class AbstractDataBindin
     {
         BUILTIN_SCHEMA_LOCS.put("http://www.w3.org/2005/08/addressing";,
                                 
"http://www.w3.org/2006/03/addressing/ws-addr.xsd";);
+        BUILTIN_SCHEMA_LOCS.put("http://ws-i.org/profiles/basic/1.1/xsd";,
+                                
"http://ws-i.org/profiles/basic/1.1/swaref.xsd";);
     }
     protected boolean mtomEnabled;
     protected int mtomThreshold;

Modified: 
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1242263&r1=1242262&r2=1242263&view=diff
==============================================================================
--- 
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
 (original)
+++ 
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
 Thu Feb  9 10:24:58 2012
@@ -351,8 +351,9 @@ public class JavaToWSTest extends ToolTe
         File file = new File(output.getPath() + "/AddNumbers.wsdl");
         String str = FileUtils.getStringFromFile(file);
         String swaImport = "http://ws-i.org/profiles/basic/1.1/xsd";;
+        String schemaLoc = "http://ws-i.org/profiles/basic/1.1/swaref.xsd";;
         assertTrue("Java2wsdl did not generate swaRef type element",
-                   str.indexOf(":swaRef") > -1 && str.indexOf(swaImport) > -1);
+                   str.indexOf(":swaRef") > -1 && str.indexOf(swaImport) > -1 
&& str.indexOf(schemaLoc) > -1);
 
     }