svn commit: r1354432 - in /axis/axis2/java/core/trunk/modules: kernel/pom.xml parent/pom.xml tool/axis2-idea-plugin/pom.xml
Author: sagara
Date: Wed Jun 27 11:26:10 2012
New Revision: 1354432
URL: http://svn.apache.org/viewvc?rev=1354432&view=rev
Log:
Change POM dependencies according to recent Woden changes.
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/tool/axis2-idea-plugin/pom.xml
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=1354432&r1=1354431&r2=1354432&view=diff
==
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Wed Jun 27 11:26:10 2012
@@ -71,12 +71,7 @@
org.apache.woden
-woden-api
-${woden.version}
-
-
-org.apache.woden
-woden-impl-dom
+woden-core
${woden.version}
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=1354432&r1=1354431&r2=1354432&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Jun 27 11:26:10 2012
@@ -742,15 +742,10 @@
org.apache.woden
-woden-api
+woden-core
${woden.version}
-org.apache.woden
-woden-impl-dom
-${woden.version}
-
-
javax.ws.rs
jsr311-api
${jsr311.api.version}
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml?rev=1354432&r1=1354431&r2=1354432&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml Wed Jun
27 11:26:10 2012
@@ -118,11 +118,7 @@
org.apache.woden
-woden-api
-
-
-org.apache.woden
-woden-impl-dom
+woden-core
log4j
svn commit: r1354438 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Author: sagara
Date: Wed Jun 27 11:41:22 2012
New Revision: 1354438
URL: http://svn.apache.org/viewvc?rev=1354438&view=rev
Log:
Applying patch for AXIS2-3818.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=1354438&r1=1354437&r2=1354438&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Wed Jun 27 11:41:22 2012
@@ -173,21 +173,13 @@ public class CommonsHTTPTransportSender
format.setMimeBoundary((String) mimeBoundaryProperty);
}
- // set the timeout properties
-Parameter soTimeoutParam =
transportOut.getParameter(HTTPConstants.SO_TIMEOUT);
-Parameter connTimeoutParam =
transportOut.getParameter(HTTPConstants.CONNECTION_TIMEOUT);
-
// set the property values only if they are not set by the user
explicitly
-if ((soTimeoutParam != null) &&
-(msgContext.getProperty(HTTPConstants.SO_TIMEOUT) ==
null)) {
-msgContext.setProperty(HTTPConstants.SO_TIMEOUT,
-new Integer((String) soTimeoutParam.getValue()));
+if (msgContext.getProperty(HTTPConstants.SO_TIMEOUT) == null) {
+msgContext.setProperty(HTTPConstants.SO_TIMEOUT, soTimeout);
}
-if ((connTimeoutParam != null) &&
-(msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT)
== null)) {
-msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
-new Integer((String) connTimeoutParam.getValue()));
+if (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT) ==
null) {
+msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
connectionTimeout);
}
//if a parameter has set been set, we will omit the SOAP action
for SOAP 1.2
svn commit: r1354453 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Author: sagara
Date: Wed Jun 27 12:03:08 2012
New Revision: 1354453
URL: http://svn.apache.org/viewvc?rev=1354453&view=rev
Log:
AXIS2-3818- Merged r1354438 to 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Propchange: axis/axis2/java/core/branches/1_6/
--
Merged /axis/axis2/java/core/trunk:r1354438
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=1354453&r1=1354452&r2=1354453&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Wed Jun 27 12:03:08 2012
@@ -168,21 +168,13 @@ public class CommonsHTTPTransportSender
format.setMimeBoundary((String) mimeBoundaryProperty);
}
- // set the timeout properties
-Parameter soTimeoutParam =
transportOut.getParameter(HTTPConstants.SO_TIMEOUT);
-Parameter connTimeoutParam =
transportOut.getParameter(HTTPConstants.CONNECTION_TIMEOUT);
-
// set the property values only if they are not set by the user
explicitly
-if ((soTimeoutParam != null) &&
-(msgContext.getProperty(HTTPConstants.SO_TIMEOUT) ==
null)) {
-msgContext.setProperty(HTTPConstants.SO_TIMEOUT,
-new Integer((String) soTimeoutParam.getValue()));
+if (msgContext.getProperty(HTTPConstants.SO_TIMEOUT) == null) {
+msgContext.setProperty(HTTPConstants.SO_TIMEOUT, soTimeout);
}
-if ((connTimeoutParam != null) &&
-(msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT)
== null)) {
-msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
-new Integer((String) connTimeoutParam.getValue()));
+if (msgContext.getProperty(HTTPConstants.CONNECTION_TIMEOUT) ==
null) {
+msgContext.setProperty(HTTPConstants.CONNECTION_TIMEOUT,
connectionTimeout);
}
//if a parameter has set been set, we will omit the SOAP action
for SOAP 1.2
