Author: gnodet
Date: Tue Sep 5 02:09:26 2006
New Revision: 440300
URL: http://svn.apache.org/viewvc?view=rev&rev=440300
Log:
Remove httpunit dependency
Modified:
incubator/servicemix/trunk/servicemix-components/pom.xml
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/pom.xml?view=diff&rev=440300&r1=440299&r2=440300
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Tue Sep 5
02:09:26 2006
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
<optional>true</optional>
</dependency>
@@ -185,11 +185,6 @@
</dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
Modified:
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java?view=diff&rev=440300&r1=440299&r2=440300
==============================================================================
---
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
Tue Sep 5 02:09:26 2006
@@ -28,6 +28,9 @@
import junit.framework.TestCase;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.servicemix.components.http.HttpSoapConnector;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -35,10 +38,6 @@
import org.codehaus.xfire.attachments.JavaMailAttachments;
import org.codehaus.xfire.attachments.SimpleAttachment;
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebResponse;
-
public class HttpSoapAttachmentsTest extends TestCase {
private static final int PORT = 7012;
@@ -81,10 +80,11 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
sendAtts.write(bos);
InputStream is = new ByteArrayInputStream(bos.toByteArray());
- PostMethodWebRequest req = new PostMethodWebRequest(
- "http://localhost:"; + PORT, is, sendAtts.getContentType());
- WebResponse response = new WebConversation().getResponse(req);
- System.out.println(response.getText());
+ PostMethod method = new PostMethod("http://localhost:"; + PORT);
+ method.setRequestEntity(new InputStreamRequestEntity(is));
+ method.setRequestHeader("Content-Type", sendAtts.getContentType());
+ new HttpClient().executeMethod(method);
+ System.out.println(method.getResponseBodyAsString());
}
private DataHandler createDataHandler(String name) throws
MessagingException {
Modified:
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java?view=diff&rev=440300&r1=440299&r2=440300
==============================================================================
---
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
Tue Sep 5 02:09:26 2006
@@ -29,10 +29,9 @@
import junit.framework.TestCase;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.servicemix.components.http.HttpSoapClientMarshaler;
-import org.apache.servicemix.components.http.HttpSoapConnector;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
import org.apache.servicemix.components.util.TraceComponent;
@@ -50,10 +49,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebResponse;
-
public class HttpSoapTest extends TestCase {
protected JBIContainer container;
@@ -115,10 +110,10 @@
as.setDestinationService(new QName("trace"));
container.activateComponent(as);
- PostMethodWebRequest req = new PostMethodWebRequest(
- "http://localhost:"; + PORT + "/?name=Guillaume",
getClass().getResourceAsStream("soap-request.xml"), null);
- WebResponse response = new WebConversation().getResponse(req);
- System.out.println(response.getText());
+ PostMethod method = new PostMethod("http://localhost:"; + PORT +
"/?name=Guillaume");
+ method.setRequestEntity(new
InputStreamRequestEntity(getClass().getResourceAsStream("soap-request.xml")));
+ new HttpClient().executeMethod(method);
+ System.out.println(method.getResponseBodyAsString());
}
public void testMarhaler() throws Exception {
