Author: sagara
Date: Tue May 1 07:22:19 2012
New Revision: 1332545
URL: http://svn.apache.org/viewvc?rev=1332545&view=rev
Log:
Fixed AXIS2-5309.
* Changed JSR311-api version.
* Removed JSR311-api from HTTP transport test cases.
Modified:
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1332545&r1=1332544&r2=1332545&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Tue May 1 07:22:19 2012
@@ -86,7 +86,6 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1332545&r1=1332544&r2=1332545&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue May 1 07:22:19 2012
@@ -130,6 +130,7 @@
<geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
<jaxws.tools.version>2.2.5</jaxws.tools.version>
<jaxws.rt.version>2.2.5</jaxws.rt.version>
+ <jsr311.api.version>1.1.1</jsr311.api.version>
</properties>
<mailingLists>
<mailingList>
@@ -743,6 +744,11 @@
<artifactId>woden-impl-dom</artifactId>
<version>${woden.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311.api.version}</version>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Modified:
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java?rev=1332545&r1=1332544&r2=1332545&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
Tue May 1 07:22:19 2012
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.net.URL;
import javax.mail.MessagingException;
-import javax.ws.rs.core.HttpHeaders;
-
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
@@ -86,11 +84,11 @@ public class HTTPSenderTest extends Abst
getHeaders().get("SOAPAction"));
assertEquals("Not the expected HTTP Header value",
"application/x-www-form-urlencoded;action=\"urn:getService\";",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
/**
@@ -110,11 +108,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected HTTP Header value", "urn:postService",
getHeaders().get("SOAPAction"));
assertEquals("Not the expected HTTP Header value", "application/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
// test with SOAP payload.
sendViaHTTP(Constants.Configuration.HTTP_METHOD_POST,
"urn:postService",
@@ -125,11 +123,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected HTTP Header value", "urn:postService",
getHeaders().get("SOAPAction").replace("\"", ""));
assertEquals("Not the expected HTTP Header value", "text/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
/**
@@ -149,11 +147,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected HTTP Header value", "urn:putService",
getHeaders().get("SOAPAction"));
assertEquals("Not the expected HTTP Header value", "application/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
// test with SOAP payload.
sendViaHTTP(Constants.Configuration.HTTP_METHOD_PUT, "urn:putService",
@@ -164,11 +162,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected HTTP Header value", "urn:putService",
getHeaders().get("SOAPAction").replace("\"", ""));
assertEquals("Not the expected HTTP Header value", "text/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
/**
@@ -187,11 +185,11 @@ public class HTTPSenderTest extends Abst
getStringContent());
assertEquals("Not the expected HTTP Header value",
"application/x-www-form-urlencoded;action=\"urn:deleteService\";", getHeaders()
- .get(HttpHeaders.CONTENT_TYPE));
+ .get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
@@ -210,11 +208,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected content",
getEnvelope().getFirstElement().getFirstElement()
.toString(), getStringContent());
assertEquals("Not the expected HTTP Header value", "application/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
@@ -234,11 +232,11 @@ public class HTTPSenderTest extends Abst
assertEquals("Not the expected HTTP Header value", "urn:noService",
getHeaders().get("SOAPAction"));
assertEquals("Not the expected HTTP Header value", "application/xml",
- getHeaders().get(HttpHeaders.CONTENT_TYPE));
+ getHeaders().get("Content-Type"));
assertEquals("Not the expected HTTP Header value", "localhost:" + port,
- getHeaders().get(HttpHeaders.HOST));
+ getHeaders().get("Host"));
assertEquals("Not the expected HTTP Header value", "Axis2",
- getHeaders().get(HttpHeaders.USER_AGENT));
+ getHeaders().get("User-Agent"));
}
