You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/02/11 20:13:15 UTC
svn commit: r909110 - in /cxf/branches/2.2.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/
systests/databinding/src/test/java/org/apache/cxf/systest/aegis/
Author: dkulp
Date: Thu Feb 11 19:12:56 2010
New Revision: 909110
URL: http://svn.apache.org/viewvc?rev=909110&view=rev
Log:
Merged revisions 909083 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r909083 | dkulp | 2010-02-11 12:20:01 -0500 (Thu, 11 Feb 2010) | 1 line
[CXF-2668, CXF-2665] Wrong namespace used for the schema
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=909110&r1=909109&r2=909110&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Thu Feb 11 19:12:56 2010
@@ -257,7 +257,8 @@
}
}
- aegisContext.setMappingNamespaceURI(s.getServiceInfos().get(0).getName().getNamespaceURI());
+ aegisContext.setMappingNamespaceURI(s.getServiceInfos().get(0)
+ .getInterface().getName().getNamespaceURI());
aegisContext.initialize();
this.service = s;
Modified: cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java?rev=909110&r1=909109&r2=909110&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java Thu Feb 11 19:12:56 2010
@@ -30,7 +30,7 @@
/**
*
*/
-@WebService(name = "AegisJaxWs")
+@WebService(name = "AegisJaxWs", targetNamespace = "http://test.cxf.apache.org")
public interface AegisJaxWs {
@WebMethod
void addItem(@WebParam(name = "item")
@@ -47,4 +47,11 @@
Item getItemByKey(@WebParam(name = "key1")
String key1, @WebParam(name = "key2")
String key2);
+
+ @WebMethod
+ Integer getSimpleValue(@WebParam(name = "a")Integer a, @WebParam(name = "b")String b);
+
+ //try comment this method
+ @WebMethod
+ java.util.List<String> getStringList();
}
Modified: cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java?rev=909110&r1=909109&r2=909110&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java Thu Feb 11 19:12:56 2010
@@ -18,7 +18,9 @@
*/
package org.apache.cxf.systest.aegis;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.jws.WebService;
@@ -50,5 +52,11 @@
}
+ public Integer getSimpleValue(Integer a, String b) {
+ return a;
+ }
+ public List<String> getStringList() {
+ return Arrays.asList("a", "b", "c");
+ }
}
Modified: cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java?rev=909110&r1=909109&r2=909110&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java Thu Feb 11 19:12:56 2010
@@ -19,7 +19,9 @@
package org.apache.cxf.systest.aegis;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -100,5 +102,15 @@
Assert.assertEquals(42, key2.intValue());
Assert.assertEquals("Godzilla", item2.getData());
}
-
+ @Test
+ public void testGetStringList() throws Exception {
+ setupForTest(false);
+
+ Integer soucet = client.getSimpleValue(5, "aa");
+ //this one fail, when comment org.apache.cxf.systest.aegis.AegisJaxWs.getStringList test pass
+ Assert.assertEquals(new Integer(5), soucet);
+
+ List<String> item = client.getStringList();
+ Assert.assertEquals(Arrays.asList("a", "b", "c"), item);
+ }
}