Author: dkulp
Date: Thu Aug 12 20:34:45 2010
New Revision: 984950
URL: http://svn.apache.org/viewvc?rev=984950&view=rev
Log:
Fix test failing on java5. (Honestly, not sure why it's passing on
java6)
Modified:
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Modified:
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java?rev=984950&r1=984949&r2=984950&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
(original)
+++
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
Thu Aug 12 20:34:45 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/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=984950&r1=984949&r2=984950&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 Aug 12 20:34:45 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() {
