Diff
Modified: trunk/components/jaxws/project.properties (679 => 680)
--- trunk/components/jaxws/project.properties 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/project.properties 2005-10-26 23:19:00 UTC (rev 680)
@@ -19,7 +19,4 @@
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent,\
http://jakarta.apache.org/commons/logging/apidocs
-maven.jar.http=${basedir}/lib/sun/http.jar
-maven.jar.jsr250=${basedir}/lib/sun/jsr250-api.jar
-
maven.eclipse.classpath.include=src/test/resources
Modified: trunk/components/jaxws/project.xml (679 => 680)
--- trunk/components/jaxws/project.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/project.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -22,123 +22,73 @@
<dependencies>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
-
- <!-- for spring integration -->
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
- <version>2.4-rc4</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc4</version>
- </dependency>
-
- <!-- mx4j only required on Java 1.4 -->
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>2.1.1</version>
- </dependency>
-
-
-
<!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
<dependency>
<groupId>servicemix</groupId>
<artifactId>jsr181-api</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-api</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-api</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-api</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-impl</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
- <id>jsr250</id>
- <jar>jsr250-api.jar</jar>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>20051026</version>
</dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>20051026</version>
+ </dependency>
<!-- jstrachan patch from CVS HEAD -->
<dependency>
<groupId>servicemix</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>dev-1</version>
+ <version>20051026</version>
</dependency>
<!-- Sun's http server -->
<dependency>
- <id>http</id>
- <jar>http.jar</jar>
+ <groupId>servicemix</groupId>
+ <artifactId>http</artifactId>
+ <version>20051026</version>
</dependency>
<!-- Sun's StAX implementation -->
<dependency>
<groupId>servicemix</groupId>
<artifactId>sjsxp</artifactId>
- <version>20050915</version>
+ <version>20051026</version>
</dependency>
<dependency>
@@ -184,6 +134,11 @@
<artifactId>backport-util-concurrent</artifactId>
<version>2.0_01_pd</version>
</dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
<dependency>
<groupId>xbean</groupId>
@@ -212,6 +167,63 @@
<version>1.0.3</version>
</dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-components</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+
+ <!-- for spring integration -->
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>1.0.2-rc4</version>
+ </dependency>
+
+ <!-- mx4j only required on Java 1.4 -->
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+
+
</dependencies>
Modified: trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSInBinding.java (679 => 680)
--- trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSInBinding.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSInBinding.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -100,10 +100,9 @@
rtEndpointInfo.setImplementor(implementor);
rtEndpointInfo.setImplementorClass(implementor.getClass());
rtEndpointInfo.setBinding(BindingImpl.getBinding(binding, implementor.getClass(), false));
- rtEndpointInfo.deploy();
+ rtEndpointInfo.init();
rtEndpointInfo.setWebServiceContext(new WebServiceContextImpl());
rtEndpointInfo.injectContext();
- rtEndpointInfo.injectComplete();
rtEndpointInfo.beginService();
}
Modified: trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSServiceUnit.java (679 => 680)
--- trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSServiceUnit.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/JAXWSServiceUnit.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -56,10 +56,9 @@
rtEndpointInfo.setImplementor(es.getPojo());
rtEndpointInfo.setImplementorClass(es.getPojo().getClass());
rtEndpointInfo.setBinding(BindingImpl.getBinding(null, es.getPojo().getClass(), false));
- rtEndpointInfo.deploy();
+ rtEndpointInfo.init();
rtEndpointInfo.setWebServiceContext(new WebServiceContextImpl());
rtEndpointInfo.injectContext();
- rtEndpointInfo.injectComplete();
QName serviceName = rtEndpointInfo.getServiceName();
String endpointName = rtEndpointInfo.getPortName().getLocalPart();
if (es.getServiceName() == null) {
Modified: trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/WSConnectionDelegate.java (679 => 680)
--- trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/WSConnectionDelegate.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/main/java/org/servicemix/components/jaxws/WSConnectionDelegate.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -3,26 +3,29 @@
*/
package org.servicemix.components.jaxws;
+import com.sun.xml.ws.client.ClientTransportException;
+import com.sun.xml.ws.pept.ept.EPTFactory;
+import com.sun.xml.ws.pept.transport.Connection;
+import com.sun.xml.ws.spi.runtime.WSConnection;
+
+import org.servicemix.jbi.jaxp.BytesSource;
+import org.servicemix.jbi.jaxp.SourceTransformer;
+
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.transform.stream.StreamSource;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.transform.stream.StreamSource;
-
-import org.servicemix.jbi.jaxp.BytesSource;
-import org.servicemix.jbi.jaxp.SourceTransformer;
-
-import com.sun.pept.ept.EPTFactory;
-import com.sun.xml.ws.client.ClientTransportException;
-import com.sun.xml.ws.spi.runtime.WSConnection;
-
-class WSConnectionDelegate implements WSConnection {
+class WSConnectionDelegate implements WSConnection, Connection {
private NormalizedMessage in;
private NormalizedMessage out;
private InputStream is;
@@ -35,8 +38,11 @@
}
public Map<String, List<String>> getHeaders() {
- // TODO Auto-generated method stub
- return null;
+ Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ List<String> l = new ArrayList<String>();
+ l.add("text/xml");
+ headers.put("Content-Type", l);
+ return headers;
}
public void setHeaders(Map<String, List<String>> headers) {
Modified: trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSInTest.java (679 => 680)
--- trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSInTest.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSInTest.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -43,12 +43,7 @@
String file = "requestWithEnvelope.xml";
Object answer = requestServiceWithFileRequest(serviceName, file);
-
- if (answer instanceof Source) {
- answer = transformer.toDOMNode((Source) answer);
- }
- assertTrue("Should return a DOM Node: " + answer, answer instanceof Node);
-
+ assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
System.out.println(transformer.toString(node));
Modified: trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSOutTest.java (679 => 680)
--- trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSOutTest.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JAXWSOutTest.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -19,9 +19,15 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamResult;
+import java.io.ByteArrayOutputStream;
+
import org.servicemix.TestSupport;
+import org.servicemix.jbi.jaxp.ResourceSource;
+import org.servicemix.jbi.jaxp.SourceTransformer;
import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.core.io.ClassPathResource;
import org.w3c.dom.Node;
import org.xbean.spring.context.ClassPathXmlApplicationContext;
@@ -33,16 +39,11 @@
protected String quote = "SUNW";
public void testJAXWSService() throws Exception {
- QName serviceName = new QName("http://duke.org", "AddNumbersService");
+ QName serviceName = new QName("http://jaxws.components.servicemix.org/", "AddNumbersService");
String file = "request.xml";
Object answer = requestServiceWithFileRequest(serviceName, file);
-
- if (answer instanceof Source) {
- answer = transformer.toDOMNode((Source) answer);
- }
- assertTrue("Should return a DOM Node: " + answer, answer instanceof Node);
-
+ assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
System.out.println(transformer.toString(node));
Modified: trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JXAWSComponentTest.java (679 => 680)
--- trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JXAWSComponentTest.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/JXAWSComponentTest.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,17 +1,7 @@
package org.servicemix.components.jaxws;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
+import com.sun.org.apache.xpath.internal.CachedXPathAPI;
-import javax.jbi.JBIException;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
import org.servicemix.client.DefaultServiceMixClient;
import org.servicemix.client.ServiceMixClient;
import org.servicemix.jbi.container.ActivationSpec;
@@ -23,8 +13,18 @@
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
-import com.sun.org.apache.xpath.internal.CachedXPathAPI;
+import javax.jbi.JBIException;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
public class JXAWSComponentTest extends TestCase {
protected JBIContainer container;
@@ -49,7 +49,7 @@
component.start("addNumbers");
SourceTransformer transformer = new SourceTransformer();
- QName serviceName = new QName("http://foo.bar.com", "myService");
+ QName serviceName = new QName("http://jaxws.components.servicemix.org/", "AddNumbersImplService");
String file = "requestWithEnvelope.xml";
Object answer = requestServiceWithFileRequest(serviceName, file);
if (answer instanceof Source) {
@@ -99,4 +99,5 @@
}
}
+
}
Modified: trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/ServiceBinderTest.java (679 => 680)
--- trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/ServiceBinderTest.java 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/java/org/servicemix/components/jaxws/ServiceBinderTest.java 2005-10-26 23:19:00 UTC (rev 680)
@@ -21,6 +21,10 @@
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
/**
* @version $Revision$
*/
@@ -32,6 +36,15 @@
}
public void testBinding() throws Exception {
+ InputStream s = new URL("http://localhost:8080/addnumbers/?wsdl").openStream();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int c;
+ while ((c = s.read()) >= 0) {
+ baos.write(c);
+ }
+ System.out.println(baos.toString());
+
+
AddNumbers a = (AddNumbers) context.getBean("addNumbersClient");
int result = a.addNumbers(3, 2);
assertEquals(5, result);
Modified: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/AddNumbers.wsdl (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/AddNumbers.wsdl 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/AddNumbers.wsdl 2005-10-26 23:19:00 UTC (rev 680)
@@ -2,15 +2,15 @@
<definitions
name="AddNumbers"
- targetNamespace="http://duke.org"
- xmlns:tns="http://duke.org"
+ targetNamespace="http://jaxws.components.servicemix.org/"
+ xmlns:tns="http://jaxws.components.servicemix.org/"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<types>
<xsd:schema
xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://duke.org"
+ targetNamespace="http://jaxws.components.servicemix.org/"
elementFormDefault="qualified">
<complexType name="addNumbersResponse">
Modified: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/jaxws-out.xml (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/jaxws-out.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/jaxws-out.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:foo="http://duke.org">
+<beans xmlns:foo="http://jaxws.components.servicemix.org/">
<container id="jbi" xmlns="http://servicemix.org/config/1.0">
<activationSpecs>
Modified: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/request.xml (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/request.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/request.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ns2:addNumbers xmlns:ns2="http://duke.org">
+<ns2:addNumbers xmlns:ns2="http://jaxws.components.servicemix.org/">
<arg0>10</arg0>
<arg1>20</arg1>
</ns2:addNumbers>
\ No newline at end of file
Modified: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/requestWithEnvelope.xml (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/requestWithEnvelope.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/requestWithEnvelope.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SOAP:Envelope xmlns:SOAP="http://schemas.xmlsoap.org/soap/envelope/">
+<SOAP:Envelope xmlns:SOAP="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns2="http://jaxws.components.servicemix.org/">
<SOAP:Body>
- <ns2:addNumbers xmlns:ns2="http://jaxws.components.servicemix.org/">
+ <ns2:addNumbers>
<arg0>10</arg0>
<arg1>20</arg1>
</ns2:addNumbers>
Deleted: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/response.xml (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/response.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/response.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addNumbersResponse xmlns:r='http://duke.org'>
- <return>1234</return>
-</addNumbersResponse>
Modified: trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/responseWithEnvelope.xml (679 => 680)
--- trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/responseWithEnvelope.xml 2005-10-26 23:14:49 UTC (rev 679)
+++ trunk/components/jaxws/src/test/resources/org/servicemix/components/jaxws/responseWithEnvelope.xml 2005-10-26 23:19:00 UTC (rev 680)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SOAP:Envelope xmlns:SOAP="http://schemas.xmlsoap.org/soap/envelope/">
+<SOAP:Envelope xmlns:SOAP="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:tns="http://jaxws.components.servicemix.org/">
<SOAP:Body>
- <r:addNumbersResponse xmlns:r='http://duke.org'>
- <r:return>1234</r:return>
- </r:addNumbersResponse>
+ <tns:addNumbersResponse>
+ <tns:return>1234</tns:return>
+ </tns:addNumbersResponse>
</SOAP:Body>
</SOAP:Envelope>
