You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2012/02/09 11:45:41 UTC
svn commit: r1242269 - in /cxf/branches/2.4.x-fixes: ./
api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Author: ema
Date: Thu Feb 9 10:45:40 2012
New Revision: 1242269
URL: http://svn.apache.org/viewvc?rev=1242269&view=rev
Log:
Merged revisions 1242264 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1242264 | ema | 2012-02-09 18:31:43 +0800 (Thu, 09 Feb 2012) | 9 lines
Merged revisions 1242263 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1242263 | ema | 2012-02-09 18:24:58 +0800 (Thu, 09 Feb 2012) | 1 line
[CXF-4095]:schemaLocation attribute for swaRef namespace http://ws-i.org/profiles/basic/1.1/xsd is wrongly removed
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Feb 9 10:45:40 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1242264
+/cxf/trunk:1242263
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=1242269&r1=1242268&r2=1242269&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java (original)
+++ cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java Thu Feb 9 10:45:40 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/branches/2.4.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1242269&r1=1242268&r2=1242269&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java (original)
+++ cxf/branches/2.4.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java Thu Feb 9 10:45:40 2012
@@ -338,8 +338,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);
}