| Commit in servicemix/components/jaxws on MAIN | |||
| src/test/java/org/servicemix/components/jaxws/JAXWSTest.java | +4 | 1.3 -> 1.4 | |
| .classpath | +3 | -4 | 1.4 -> 1.5 |
| src/main/java/org/servicemix/components/jaxws/JAXWSBinding.java | +5 | -9 | 1.5 -> 1.6 |
| +12 | -13 | ||
fixed test case so that it runs in eclipse; though it still fails for me in the maven build...
servicemix/components/jaxws/src/test/java/org/servicemix/components/jaxws
diff -u -r1.3 -r1.4 --- JAXWSTest.java 4 Sep 2005 10:12:34 -0000 1.3 +++ JAXWSTest.java 23 Sep 2005 14:23:20 -0000 1.4 @@ -23,6 +23,7 @@
import org.w3c.dom.Node; import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
/** * @version $Revision$
@@ -37,6 +38,9 @@
Object answer = requestServiceWithFileRequest(serviceName, file);
+ if (answer instanceof Source) {
+ answer = transformer.toDOMNode((Source) answer);
+ }
assertTrue("Should return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
servicemix/components/jaxws
diff -u -r1.4 -r1.5 --- .classpath 22 Sep 2005 16:23:01 -0000 1.4 +++ .classpath 23 Sep 2005 14:23:20 -0000 1.5 @@ -4,14 +4,10 @@
<classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/saaj-impl-20050915.jar"/> <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/saaj-api-20050915.jar"/> <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jsr181-api-20050915.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-rt-dev-1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-api-20050915.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-xjc-20050915.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-impl-20050915.jar"/> <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/spring-1.2.2-dev-2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/servicemix-1.1-SNAPSHOT.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-api-20050915.jar"/>
- <classpathentry sourcepath="/jaxws-ri/rt/src" kind="lib" path="/jaxws-ri/build/lib/jaxws-rt.jar"/>
<classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/test/resources"/> <classpathentry kind="src" path="src/test/java"/>
@@ -27,5 +23,8 @@
<classpathentry kind="var" path="MAVEN_REPO/jetty/jars/jasper-compiler-4.2.20RC0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/jetty/jars/org.mortbay.jetty-4.2.20RC0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/stax/jars/stax-api-1.0.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxws-rt-dev-1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/servicemix/jars/jaxb-xjc-20050915.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/servicemix"/>
<classpathentry kind="output" path="bin"/> </classpath>
servicemix/components/jaxws/src/main/java/org/servicemix/components/jaxws
diff -u -r1.5 -r1.6 --- JAXWSBinding.java 22 Sep 2005 16:23:01 -0000 1.5 +++ JAXWSBinding.java 23 Sep 2005 14:23:20 -0000 1.6 @@ -21,6 +21,7 @@
import org.apache.commons.logging.LogFactory; import org.servicemix.MessageExchangeListener; import org.servicemix.components.util.TransformComponentSupport;
+import org.servicemix.jbi.jaxp.SourceTransformer;
import org.springframework.core.io.Resource; import org.w3c.dom.Node;
@@ -62,6 +63,7 @@
private Mode mode = Mode.PAYLOAD;
private boolean defaultInOut = true;
private Resource wsdlResource;
+ private SourceTransformer sourceTransformer = new SourceTransformer();
public Dispatch<Source> getDispatch() throws IOException, URISyntaxException, MessagingException {
if (dispatch == null) {
@@ -157,21 +159,19 @@
if (isInOutRequest(exchange, in, out)) {
copyPropertiesAndAttachments(exchange, in, out);
Object answer = dispatch.invoke(content);
- System.out.println("##### received a response: " + answer);
- log.info("received a response: " + answer);
-
+
Source source = null;
if (answer instanceof Source) {
source = (Source) answer;
}
else if (answer instanceof Node) {
- source = new DOMSource((Node) source);
+ source = new DOMSource((Node) answer);
}
else if (answer instanceof Throwable) {
throw new MessagingException((Throwable) answer);
}
else {
- throw new MessagingException("Unknown source type: " + source);
+ throw new MessagingException("Unknown source type: " + answer);
}
out.setContent(source);
}
@@ -202,10 +202,6 @@
if (interfaceName == null) {
interfaceName = findInterfaceName(webService);
}
- /* - * webService.addPort(interfaceName, getPortBindingId(), - * getEndpointAddress()); - */
return webService.createDispatch(interfaceName, Source.class, getMode());
}
