JBossWS SVN: r9687 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-03-26 03:54:14 -0400 (Thu, 26 Mar 2009)
New Revision: 9687
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2533] Enabling Tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-26 07:51:52 UTC (rev 9686)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-26 07:54:14 UTC (rev 9687)
@@ -74,9 +74,6 @@
# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
org/jboss/test/ws/jaxws/jbws2527/**
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
-
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-26 07:51:52 UTC (rev 9686)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-26 07:54:14 UTC (rev 9687)
@@ -50,9 +50,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
-
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-26 07:51:52 UTC (rev 9686)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-26 07:54:14 UTC (rev 9687)
@@ -50,9 +50,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
-
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-26 07:51:52 UTC (rev 9686)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-26 07:54:14 UTC (rev 9687)
@@ -50,9 +50,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
-
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-26 07:51:52 UTC (rev 9686)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-26 07:54:14 UTC (rev 9687)
@@ -50,9 +50,6 @@
# [JBWS-2480] Soap attachments are dropped on server response
org/jboss/test/ws/jaxws/jbws1283/**
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
-
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
17 years
JBossWS SVN: r9686 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-03-26 03:51:52 -0400 (Thu, 26 Mar 2009)
New Revision: 9686
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java
Log:
[JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -97,6 +97,11 @@
//Metro does not process this header into the message
Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS);
ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type");
+ if (ctype == null)
+ {
+ //Cxf stores it in lower case
+ ctype = (headers == null) ? null : headers.get("content-type");
+ }
log.info("ctype="+ctype);
if (ctype == null)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -26,11 +26,11 @@
import javax.activation.DataHandler;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
@WebService(name = "SOAP11Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws2419")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
@BindingType(SOAP11HTTP_MTOM_BINDING)
public interface SOAP11Endpoint
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -30,6 +30,7 @@
import javax.activation.DataHandler;
import javax.jws.HandlerChain;
+import javax.jws.soap.SOAPBinding;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
@@ -40,6 +41,7 @@
@WebService(name="SOAP11Endpoint", targetNamespace="http://org.jboss.ws/jaxws/jbws2419")
@HandlerChain(file = "jaxws-server-handlers1.xml")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
@BindingType(SOAP11HTTP_MTOM_BINDING)
public class SOAP11EndpointBean implements SOAP11Endpoint
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -96,6 +96,11 @@
//Metro does not process this header into the message
Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS);
ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type");
+ if (ctype == null)
+ {
+ //Cxf stores it in lower case
+ ctype = (headers == null) ? null : headers.get("content-type");
+ }
log.info("ctype="+ctype);
if (ctype == null)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -97,6 +97,11 @@
//Metro does not process this header into the message
Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS);
ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type");
+ if (ctype == null)
+ {
+ //Cxf stores it in lower case
+ ctype = (headers == null) ? null : headers.get("content-type");
+ }
log.info("ctype="+ctype);
if (ctype == null)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -26,11 +26,11 @@
import javax.activation.DataHandler;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
@WebService(name = "SOAP12Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws2419")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
@BindingType(SOAP12HTTP_MTOM_BINDING)
public interface SOAP12Endpoint
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -30,6 +30,7 @@
import javax.activation.DataHandler;
import javax.jws.HandlerChain;
+import javax.jws.soap.SOAPBinding;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
@@ -40,6 +41,7 @@
@WebService(name="SOAP12Endpoint", targetNamespace="http://org.jboss.ws/jaxws/jbws2419",
wsdlLocation = "WEB-INF/wsdl/SOAP12Service.wsdl")
@HandlerChain(file = "jaxws-server-handlers2.xml")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
@BindingType(SOAP12HTTP_MTOM_BINDING)
public class SOAP12EndpointBean implements SOAP12Endpoint
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2009-03-25 13:38:33 UTC (rev 9685)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2009-03-26 07:51:52 UTC (rev 9686)
@@ -96,6 +96,11 @@
//Metro does not process this header into the message
Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS);
ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type");
+ if (ctype == null)
+ {
+ //Cxf stores it in lower case
+ ctype = (headers == null) ? null : headers.get("content-type");
+ }
log.info("ctype="+ctype);
if (ctype == null)
17 years