[jbossws-commits] JBossWS SVN: r9332 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Feb 20 05:01:14 EST 2009


Author: mageshbk at jboss.com
Date: 2009-02-20 05:01:14 -0500 (Fri, 20 Feb 2009)
New Revision: 9332

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/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/SOAP12ServerHandler.java
Log:
[JBWS-2419] Removed references to MimeConstants

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-02-20 08:57:31 UTC (rev 9331)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java	2009-02-20 10:01:14 UTC (rev 9332)
@@ -31,7 +31,6 @@
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
 import org.jboss.wsf.common.handler.GenericSOAPHandler;
 
 /**
@@ -51,7 +50,7 @@
       SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
 
       MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-      String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+      String[] ct = mimeHeaders.getHeader("Content-Type");
       ContentType contentType;
       if (ct != null)
       {
@@ -60,7 +59,7 @@
             contentType = new ContentType(ct[0]);
             log.info("contentType="+contentType);
             String startInfo = contentType.getParameter("start-info");
-            if (startInfo.equals(MimeConstants.TYPE_SOAP11))
+            if (startInfo.equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
             {
                return true;
             }
@@ -83,7 +82,7 @@
          soapMessage.saveChanges();
 
          MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-         String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+         String[] ct = mimeHeaders.getHeader("Content-Type");
          ContentType contentType;
          if (ct != null)
          {

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-02-20 08:57:31 UTC (rev 9331)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java	2009-02-20 10:01:14 UTC (rev 9332)
@@ -31,7 +31,6 @@
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
 import org.jboss.wsf.common.handler.GenericSOAPHandler;
 
 /**
@@ -51,7 +50,7 @@
       SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
 
       MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-      String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+      String[] ct = mimeHeaders.getHeader("Content-Type");
       ContentType contentType;
       if (ct != null)
       {
@@ -60,7 +59,7 @@
             contentType = new ContentType(ct[0]);
             log.info("contentType="+contentType);
             String startInfo = contentType.getParameter("start-info");
-            if (startInfo.equals(MimeConstants.TYPE_SOAP11))
+            if (startInfo.equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
             {
                return true;
             }
@@ -83,7 +82,7 @@
          soapMessage.saveChanges();
 
          MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-         String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+         String[] ct = mimeHeaders.getHeader("Content-Type");
          ContentType contentType;
          if (ct != 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-02-20 08:57:31 UTC (rev 9331)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java	2009-02-20 10:01:14 UTC (rev 9332)
@@ -31,7 +31,6 @@
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
 import org.jboss.wsf.common.handler.GenericSOAPHandler;
 
 /**
@@ -51,7 +50,7 @@
       SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
 
       MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-      String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+      String[] ct = mimeHeaders.getHeader("Content-Type");
       ContentType contentType;
       if (ct != null)
       {
@@ -60,7 +59,7 @@
             contentType = new ContentType(ct[0]);
             log.info("contentType="+contentType);
             String startInfo = contentType.getParameter("start-info");
-            if (startInfo.equals(MimeConstants.TYPE_SOAP12))
+            if (startInfo.equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
             {
                return true;
             }
@@ -83,7 +82,7 @@
          soapMessage.saveChanges();
 
          MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-         String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+         String[] ct = mimeHeaders.getHeader("Content-Type");
          ContentType contentType;
          if (ct != null)
          {

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-02-20 08:57:31 UTC (rev 9331)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java	2009-02-20 10:01:14 UTC (rev 9332)
@@ -22,6 +22,7 @@
 package org.jboss.test.ws.jaxws.jbws2419;
 
 import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
 import javax.xml.soap.MimeHeaders;
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPException;
@@ -31,7 +32,6 @@
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 import org.jboss.logging.Logger;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
 import org.jboss.wsf.common.handler.GenericSOAPHandler;
 
 /**
@@ -51,7 +51,7 @@
       SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
 
       MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-      String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+      String[] ct = mimeHeaders.getHeader("Content-Type");
       ContentType contentType;
       if (ct != null)
       {
@@ -60,7 +60,7 @@
             contentType = new ContentType(ct[0]);
             log.info("contentType="+contentType);
             String startInfo = contentType.getParameter("start-info");
-            if (startInfo.equals(MimeConstants.TYPE_SOAP12))
+            if (startInfo.equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
             {
                return true;
             }
@@ -83,7 +83,7 @@
          soapMessage.saveChanges();
 
          MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
-         String[] ct = mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE);
+         String[] ct = mimeHeaders.getHeader("Content-Type");
          ContentType contentType;
          if (ct != null)
          {
@@ -94,8 +94,12 @@
          }
          return false;
       }
-      catch (Exception ex)
+      catch (ParseException e)
       {
+         throw new WebServiceException(e);
+      }
+      catch (SOAPException ex)
+      {
          throw new WebServiceException(ex);
       }
    }




More information about the jbossws-commits mailing list