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/12 22:36:38 UTC
svn commit: r984951 - in /cxf/branches/2.2.x-fixes: ./
tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Author: dkulp
Date: Thu Aug 12 20:36:37 2010
New Revision: 984951
URL: http://svn.apache.org/viewvc?rev=984951&view=rev
Log:
Merged revisions 984950 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r984950 | dkulp | 2010-08-12 16:34:45 -0400 (Thu, 12 Aug 2010) | 2 lines
Fix test failing on java5. (Honestly, not sure why it's passing on
java6)
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.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/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java?rev=984951&r1=984950&r2=984951&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java (original)
+++ cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java Thu Aug 12 20:36:37 2010
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.WebServiceProvider;
@@ -77,8 +77,12 @@ public final class FrontendFactory {
if (WrapperUtil.isWrapperClassExists(method)) {
return true;
}
- WebParam param = AnnotationUtil.getPrivMethodAnnotation(method, WebParam.class);
- if (param != null) {
+ WebMethod m = AnnotationUtil.getPrivMethodAnnotation(method, WebMethod.class);
+ if (m != null) {
+ return true;
+ }
+ WebResult res = AnnotationUtil.getPrivMethodAnnotation(method, WebResult.class);
+ if (res != null) {
return true;
}
}
Modified: cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=984951&r1=984950&r2=984951&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java (original)
+++ cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java Thu Aug 12 20:36:37 2010
@@ -91,8 +91,8 @@ public class JavaToWSTest extends ToolTe
JavaToWS.main(args);
File wrapper = outputFile("org/apache/cxf/tools/fortest/cxf2934/jaxws/HelloResponse.java");
String str = FileUtils.getStringFromFile(wrapper);
- assertTrue("namespace value in annoataion @XmlElement is not correct"
- , str.indexOf("helloString/Name") > -1);
+ assertTrue("namespace value in annoataion @XmlElement is not correct: " + str,
+ str.indexOf("helloString/Name") > -1);
}
private void checkStdErr() {