svn commit: r1378912 - in /axis/axis2/java/core/trunk/modules/transport/http: src/org/apache/axis2/transport/http/impl/httpclient3/ src/org/apache/axis2/transport/http/impl/httpclient4/ test/org/apach

2012-08-30 Thread sagara 
Author: sagara
Date: Thu Aug 30 12:38:46 2012
New Revision: 1378912

URL: http://svn.apache.org/viewvc?rev=1378912&view=rev
Log:
Fixed AXIS2-5408 - don't add "SOAPAction" HTTP header for REST messages. 

Modified:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java

axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4SenderTest.java

axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java?rev=1378912&r1=1378911&r2=1378912&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
 Thu Aug 30 12:38:46 2012
@@ -105,7 +105,7 @@ public class HTTPSenderImpl extends HTTP
 String soapAction = messageFormatter
 .formatSOAPAction(msgContext, format, soapActiionString);
 
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 getMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION, 
soapAction);
 }
 try {
@@ -201,7 +201,7 @@ public class HTTPSenderImpl extends HTTP
 
 String soapAction = messageFormatter.formatSOAPAction(msgContext, 
format, soapActionString);
 
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 postMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION, 
soapAction);
 }
 
@@ -258,7 +258,7 @@ public class HTTPSenderImpl extends HTTP
 }
 
 String soapAction = messageFormatter.formatSOAPAction(msgContext, 
format, soapActionString);
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 putMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION, 
soapAction);
 }
 

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1378912&r1=1378911&r2=1378912&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
 Thu Aug 30 12:38:46 2012
@@ -115,7 +115,7 @@ public class HTTPSenderImpl extends HTTP
 String soapAction = messageFormatter
 .formatSOAPAction(msgContext, format, soapActionString);
 
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 httpGet.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
 }
 
@@ -226,7 +226,7 @@ public class HTTPSenderImpl extends HTTP
 
 String soapAction = messageFormatter.formatSOAPAction(msgContext, 
format, soapActionString);
 
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 postMethod.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
 }
 
@@ -281,7 +281,7 @@ public class HTTPSenderImpl extends HTTP
 }
 
 String soapAction = messageFormatter.formatSOAPAction(msgContext, 
format, soapActionString);
-if (soapAction != null) {
+if (soapAction != null && !msgContext.isDoingREST()) {
 putMethod.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
 }
 

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4SenderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4SenderTest.java?rev=1378912&r1=1378911&r2=1378912&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4SenderTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4

svn commit: r1379166 - in /axis/axis2/java/core/branches/1_6: ./ modules/integration/test/org/apache/axis2/mtom/ modules/integration/test/org/apache/axis2/swa/ modules/jaxws/src/org/apache/axis2/jaxws

2012-08-30 Thread veithen 
Author: veithen
Date: Thu Aug 30 21:35:26 2012
New Revision: 1379166

URL: http://svn.apache.org/viewvc?rev=1379166&view=rev
Log:
Merged a couple of changes to ensure that the 1.6 branch can be built with 
Axiom 1.2.14-SNAPSHOT.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java

axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/swa/EchoSwA.java

axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java

axis/axis2/java/core/branches/1_6/modules/jaxws/test/org/apache/axis2/jaxws/context/listener/ParserInputStreamCustomBuilderTests.java

axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java
axis/axis2/java/core/branches/1_6/modules/saaj/   (props changed)

Propchange: axis/axis2/java/core/branches/1_6/
--
  Merged /axis/axis2/java/core/trunk:r1337975,1355706,1355710,1358413

Modified: 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=1379166&r1=1379165&r2=1379166&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
 Thu Aug 30 21:35:26 2012
@@ -27,7 +27,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.Constants;
 import org.apache.axis2.client.Options;
@@ -84,7 +83,7 @@ public class EchoRawMTOMCommonsChunkingT
 FileDataSource dataSource = new FileDataSource(fileName);
 expectedDH = new DataHandler(dataSource);
 OMElement subData = fac.createOMElement("subData", omNs);
-OMText textData = new OMTextImpl(expectedDH, fac);
+OMText textData = fac.createOMText(expectedDH, true);
 subData.addChild(textData);
 data.addChild(subData);
 rpcWrapEle.addChild(data);

Modified: 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=1379166&r1=1379165&r2=1379166&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
 Thu Aug 30 21:35:26 2012
@@ -26,7 +26,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.Constants;
 import org.apache.axis2.client.Options;
@@ -96,7 +95,7 @@ public class EchoRawMTOMLoadTest extends
 OMElement subData = fac.createOMElement("subData", omNs);
 DataHandler dataHandler = new DataHandler("Thilina", "text/plain");
 //new ByteArrayDataSource(expectedByteArray));
-textData = new OMTextImpl(dataHandler, true, fac);
+textData = fac.createOMText(dataHandler, true);
 subData.addChild(textData);
 data.addChild(subData);
 

Modified: 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/