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/08/16 20:40:00 UTC
svn commit: r986091 - in /cxf/branches/2.2.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/
tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/
tools/wsdlto/test/src/tes...
Author: dkulp
Date: Mon Aug 16 18:39:59 2010
New Revision: 986091
URL: http://svn.apache.org/viewvc?rev=986091&view=rev
Log:
Merged revisions 986015 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r986015 | ema | 2010-08-16 12:26:26 -0400 (Mon, 16 Aug 2010) | 1 line
[CXF-2944]:Get the targetNamespace value from reference element namespace in @WebResult
........
Added:
cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2944/
- copied from r986015, cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2944/
cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2944/cxf2944.wsdl
- copied unchanged from r986015, cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2944/cxf2944.wsdl
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.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/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=986091&r1=986090&r2=986091&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Mon Aug 16 18:39:59 2010
@@ -439,7 +439,7 @@ public class ParameterProcessor extends
}
if (!sameWrapperChild) {
JavaReturn jreturn = getReturnFromQName(outElement, outputPart);
- if (!qualified) {
+ if (!qualified && !this.isRefElement(outputPart, outElement)) {
jreturn.setTargetNamespace("");
}
method.setReturn(jreturn);
Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=986091&r1=986090&r2=986091&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Mon Aug 16 18:39:59 2010
@@ -28,6 +28,7 @@ import java.util.Arrays;
import java.util.List;
import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
@@ -53,6 +54,19 @@ import org.mortbay.jetty.handler.Resourc
public class CodeGenBugTest extends AbstractCodeGenTest {
@Test
+ public void testCXF2944() throws Exception {
+ env.put(ToolConstants.CFG_WSDLURL,
+ getLocation("/wsdl2java_wsdl/cxf2944/cxf2944.wsdl"));
+ env.put(ToolConstants.CFG_ALLOW_ELEMENT_REFS, "true");
+ processor.setContext(env);
+ processor.execute();
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.tools.fortest.cxf2944.WebResultService");
+ WebResult webResult = AnnotationUtil.getWebResult(clz.getMethods()[0]);
+ assertEquals("hello/name", webResult.targetNamespace());
+ assertEquals("name", webResult.name());
+ }
+
+ @Test
public void testCXF2935() throws Exception {
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/cxf2935/webservice.wsdl"));