Thu Sep 28 22:43:52 EDT 2006

Author: ryan.campbell at jboss.com
Date: 2006-09-28 22:43:50 -0400 (Thu, 28 Sep 2006)
New Revision: 57273

Added:
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/config.xml
Removed:
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl
   branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/config.xml
Modified:
   branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/Message.java
   branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/MessagePart.java
   branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/transport/http/AxisServlet.java
   branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
   branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-client-config.xml
   branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-server-config.xml
Log:
ASPATCH-75: JBWS-1034: SAAJ does not apply encoding property consistently

Modified: branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/Message.java
===================================================================

--- branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/Message.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/Message.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -498,6 +498,10 @@
          {
             ret = HTTPConstants.HEADER_ACCEPT_APPL_SOAP + "; charset=" + encoding;
          }
+         else if (envelope.getSOAPConstants() == SOAPConstants.SOAP11_CONSTANTS) 
+         {
+            ret = "text/xml; charset=" + encoding;
+         }
       }
 
       if (mAttachments != null && 0 != mAttachments.getAttachmentCount())

Modified: branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/MessagePart.java
===================================================================
--- branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/MessagePart.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/MessagePart.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -547,7 +547,23 @@
          currentMessageAsBytes = (byte[])currentMessage;
          try
          {
-            setCurrentForm(new String((byte[])currentMessage, "UTF-8"), FORM_STRING);
+            // set encoding of string from parent.
+            String encoding = null;
+            if (msgObject != null)
+            {
+               try
+               {
+                  encoding = (String)msgObject.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
+               }
+               catch (SOAPException e)
+               {
+               }
+            }
+            if (encoding == null)
+            {
+               encoding = "UTF-8";
+            }
+            setCurrentForm(new String((byte[])currentMessage, encoding), FORM_STRING);
          }
          catch (UnsupportedEncodingException ue)
          {
@@ -668,6 +684,22 @@
       else if (currentForm == FORM_BYTES)
       {
          is = new InputSource(new ByteArrayInputStream((byte[])currentMessage));
+         // set encoding of input source from parent.
+         String encoding = null;
+         if (msgObject != null)
+         {
+            try
+            {
+               encoding = (String)msgObject.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
+            }
+            catch (SOAPException e)
+            {
+            }
+         }
+         if (encoding != null)
+         {
+            is.setEncoding(encoding);
+         }
       }
       else
       {

Modified: branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/transport/http/AxisServlet.java
===================================================================
--- branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/transport/http/AxisServlet.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/transport/http/AxisServlet.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -78,6 +78,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -856,8 +858,8 @@
          {
             log.debug("XML request received");
             log.debug("----------------------------------------------");
-            MessagePart msgPart = (MessagePart)requestMsg.getSOAPPart();
-            String xmlMessage = new String(msgPart.getAsBytes());
+            MessagePart msgPart = (MessagePart)requestMsg.getSOAPPart();            
+            String xmlMessage = msgPart.getAsString();
             log.debug("----------------------------------------------");
             log.debug(xmlMessage);
             log.debug("----------------------------------------------");

Modified: branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -5208,6 +5208,29 @@
       </metainf>
     </jar>
 
+    <!-- ws4ee-jbws1034 -->
+    <war warfile="${build.lib}/ws4ee-jbws1034.war"
+      webxml="${source.resources}/webservice/jbws1034/WEB-INF/web.xml">
+      <classes dir="${build.classes}">
+        <include name="org/jboss/test/webservice/jbws1034/**"/>
+        <exclude name="org/jboss/test/webservice/jbws1034/client/**"/>
+      </classes>
+      <webinf dir="${source.resources}/webservice/jbws1034/WEB-INF">
+        <include name="webservices.xml"/>
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </webinf>
+    </war>
+    <jar destfile="${build.lib}/ws4ee-jbws1034-client.jar" manifest="${build.etc}/manifest.mf">
+      <metainf dir="${source.resources}/webservice/jbws1034/META-INF">
+        <include name="application-client.xml"/>
+        <include name="jboss-client.xml"/>
+      </metainf>
+      <metainf dir="${source.resources}/webservice/jbws1034/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+      </metainf>
+    </jar>    
+    
     <!-- ws4ee-marshall-doclit -->
     <jar destfile="${build.lib}/ws4ee-marshall-doclit.jar" manifest="${build.etc}/manifest.mf">
       <fileset dir="${build.classes}">

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034 (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,9 +0,0 @@
-package org.jboss.test.webservice.jbws1034;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface Echoer extends Remote {
-
-  public String echo(String text) throws RemoteException;
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/Echoer.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,65 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.test.webservice.jbws1034;
-
-// $Id$
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.webservice.WebserviceTestBase;
-import org.jboss.test.webservice.jbws1034.client.CharsetHandler;
-
-/** Test encoding property is correctly applied
- * 
- * @author Alejandro Guizar
- * @since 11-Jul-2006
- * @see http://jira.jboss.com/jira/browse/JBWS-1034
- */
-public class JBWS1034TestCase extends WebserviceTestBase
-{
-   private Echoer echoer;
-   
-   /** Construct the test case with a given name
-    */
-   public JBWS1034TestCase(String name)
-   {
-      super(name);
-   }
-
-   /** Deploy the test */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(JBWS1034TestCase.class, "ws4ee-jbws1034.war, ws4ee-jbws1034-client.jar");
-   }
-   
-   protected void setUp() throws Exception
-   {
-      InitialContext iniContext = getClientContext();
-      Service echoerService = (Service) iniContext.lookup("java:comp/env/service/Echoer");
-      echoer = (Echoer) echoerService.getPort(Echoer.class);
-   }
-
-   public void testDefaultEncoding() throws Exception
-   {
-      final String text = "jalapeño";
-      assertEquals(text, echoer.echo(text));
-      assertEquals("utf-8", CharsetHandler.getCurrentCharset());
-   }
-
-   public void testCustomEncoding() throws Exception
-   {
-      final String charset = "windows-1252";
-      CharsetHandler.setCurrentCharset(charset);
-      
-      final String text = "jalapeño";
-      assertEquals(text, echoer.echo(text));
-      assertEquals(charset, CharsetHandler.getCurrentCharset());
-   }
-}
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/JBWS1034TestCase.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/client)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,64 +0,0 @@
-package org.jboss.test.webservice.jbws1034.client;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.test.webservice.jbws1034.util.CharsetUtil;
-
-public class CharsetHandler extends GenericHandler
-{
-   private static ThreadLocal charsetLocal = new ThreadLocal();
-   
-   public QName[] getHeaders()
-   {
-      return null;
-   }
-   
-   public boolean handleRequest(MessageContext context) 
-   throws JAXRPCException, SOAPFaultException
-   {
-      if (context instanceof SOAPMessageContext)
-      {
-         String currentCharset = getCurrentCharset();
-         if (currentCharset != null) 
-         {
-            SOAPMessageContext soapContext = (SOAPMessageContext) context;
-            SOAPMessage message = soapContext.getMessage();
-            CharsetUtil.setCharset(message, currentCharset);
-         }
-      }
-      return true;
-   }
-
-   public boolean handleResponse(MessageContext context)
-   {
-      if (context instanceof SOAPMessageContext)
-      {
-         SOAPMessageContext soapContext = (SOAPMessageContext) context;
-         SOAPMessage response = soapContext.getMessage();
-         String responseCharset = CharsetUtil.getCharset(response);
-         setCurrentCharset(responseCharset);
-      }
-      return true;
-   }
-
-   public boolean handleFault(MessageContext context)
-   {
-      return handleResponse(context);
-   }
-
-   public static String getCurrentCharset()
-   {
-      return (String) charsetLocal.get();
-   }
-
-   public static void setCurrentCharset(String currentCharset)
-   {
-      charsetLocal.set(currentCharset);
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/client/CharsetHandler.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/server)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,45 +0,0 @@
-package org.jboss.test.webservice.jbws1034.server;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.test.webservice.jbws1034.util.CharsetUtil;
-
-public class CharsetHandler extends GenericHandler
-{
-   public QName[] getHeaders()
-   {
-      return null;
-   }
-
-   public boolean handleRequest(MessageContext context)
-   {
-      if (context instanceof SOAPMessageContext)
-      {
-         SOAPMessageContext soapContext = (SOAPMessageContext) context;
-         SOAPMessage message = soapContext.getMessage();
-         String charset = CharsetUtil.getCharset(message);
-         context.setProperty(SOAPMessage.CHARACTER_SET_ENCODING, charset);
-      }
-      return true;
-   }
-
-   public boolean handleResponse(MessageContext context)
-   {
-      if (context instanceof SOAPMessageContext)
-      {
-         SOAPMessageContext soapContext = (SOAPMessageContext) context;
-         SOAPMessage message = soapContext.getMessage();
-         CharsetUtil.setCharset(message, (String) context.getProperty(SOAPMessage.CHARACTER_SET_ENCODING));
-      }
-      return true;
-   }
-
-   public boolean handleFault(MessageContext context)
-   {
-      return handleResponse(context);
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/CharsetHandler.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,10 +0,0 @@
-package org.jboss.test.webservice.jbws1034.server;
-
-import org.jboss.test.webservice.jbws1034.Echoer;
-
-public class EchoerImpl implements Echoer {
-
-  public String echo(String text) {
-    return text;
-  }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/server/EchoerImpl.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/util)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,61 +0,0 @@
-package org.jboss.test.webservice.jbws1034.util;
-
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class CharsetUtil
-{
-   private static final Log log = LogFactory.getLog(CharsetUtil.class);
-
-   public static String getCharset(SOAPMessage message)
-   {
-      try
-      {
-         return (String) message.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
-      }
-      catch (SOAPException e)
-      {
-         return "UTF-8";
-      }
-   }
-
-   static String getCharsetFromHeader(SOAPMessage message)
-   {
-      String charset = "UTF-8";
-      String[] contentTypeHeader = message.getSOAPPart().getMimeHeader(
-            "Content-Type");
-      if (contentTypeHeader != null)
-      {
-         String contentType = contentTypeHeader[0];
-         log.debug("got content-type: " + contentType);
-         int charsetIndex = contentType.indexOf("charset=");
-         if (charsetIndex != -1)
-         {
-            charset = contentType.substring(charsetIndex + "charset=".length());
-            int separatorIndex = charset.indexOf(';');
-            if (separatorIndex != -1)
-               charset = charset.substring(0, separatorIndex);
-            log.debug("got charset: " + charset);
-         }
-      }
-      return charset;
-   }
-
-   public static void setCharset(SOAPMessage message, String charset)
-   {
-      try
-      {
-         message.setProperty(SOAPMessage.CHARACTER_SET_ENCODING, charset);
-         // message.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true");
-         log.debug("set charset: " + charset);
-      }
-      catch (SOAPException e)
-      {
-         log.error("could not set charset: " + charset, e);
-      }
-   }
-
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/main/org/jboss/test/webservice/jbws1034/util/CharsetUtil.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034 (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/META-INF)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,21 +0,0 @@
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
-
-  <display-name>echoer client</display-name>
-
-  <service-ref>
-  
-    <service-ref-name>service/Echoer</service-ref-name>
-    <service-interface>javax.xml.rpc.Service</service-interface>
-    <wsdl-file>USE_JBOSS_CLIENT_OVERRIDE</wsdl-file>
-    <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-    
-    <handler>
-      <handler-name>charsetHandler</handler-name>
-      <handler-class>org.jboss.test.webservice.jbws1034.client.CharsetHandler</handler-class>
-    </handler>
-    
-  </service-ref>
-
-</application-client>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/META-INF/application-client.xml)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,13 +0,0 @@
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN"
-  "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
-
-  <jndi-name>ws4ee-client</jndi-name>
-  
-  <service-ref>
-    <service-ref-name>service/Echoer</service-ref-name>
-    <wsdl-override>http://localhost:8080/ws4ee-jbws1034/echoerService?wsdl</wsdl-override>
-  </service-ref>
-  
-</jboss-client>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/META-INF/jboss-client.xml)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd" version="1.1">
-  <package-mapping>
-    <package-type>org.jboss.test.webservice.jbws1034</package-type>
-    <namespaceURI>urn:example:echo:types</namespaceURI>
-  </package-mapping>
-  <package-mapping>
-    <package-type>org.jboss.test.webservice.jbws1034</package-type>
-    <namespaceURI>urn:example:echo</namespaceURI>
-  </package-mapping>
-  <service-interface-mapping>
-    <service-interface>org.jboss.test.webservice.jbws1034.EchoerService</service-interface>
-    <wsdl-service-name xmlns:serviceNS="urn:example:echo">serviceNS:EchoerService</wsdl-service-name>
-    <port-mapping>
-      <port-name>EchoerPort</port-name>
-      <java-port-name>EchoerPort</java-port-name>
-    </port-mapping>
-  </service-interface-mapping>
-  <service-endpoint-interface-mapping>
-    <service-endpoint-interface>org.jboss.test.webservice.jbws1034.Echoer</service-endpoint-interface>
-    <wsdl-port-type xmlns:portTypeNS="urn:example:echo">portTypeNS:Echoer</wsdl-port-type>
-    <wsdl-binding xmlns:bindingNS="urn:example:echo">bindingNS:EchoerBinding</wsdl-binding>
-    <service-endpoint-method-mapping>
-      <java-method-name>echo</java-method-name>
-      <wsdl-operation>echo</wsdl-operation>
-      <method-param-parts-mapping>
-        <param-position>0</param-position>
-        <param-type>java.lang.String</param-type>
-        <wsdl-message-mapping>
-          <wsdl-message xmlns:wsdlMsgNS="urn:example:echo">wsdlMsgNS:Echoer_echo</wsdl-message>
-          <wsdl-message-part-name>String_1</wsdl-message-part-name>
-          <parameter-mode>IN</parameter-mode>
-        </wsdl-message-mapping>
-      </method-param-parts-mapping>
-      <wsdl-return-value-mapping>
-        <method-return-value>java.lang.String</method-return-value>
-        <wsdl-message xmlns:wsdlMsgNS="urn:example:echo">wsdlMsgNS:Echoer_echoResponse</wsdl-message>
-        <wsdl-message-part-name>result</wsdl-message-part-name>
-      </wsdl-return-value-mapping>
-    </service-endpoint-method-mapping>
-  </service-endpoint-interface-mapping>
-</java-wsdl-mapping>

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/jaxrpc-mapping.xml)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,15 +0,0 @@
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-  <servlet>
-    <servlet-name>echoerService</servlet-name>
-    <servlet-class>org.jboss.test.webservice.jbws1034.server.EchoerImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>echoerService</servlet-name>
-    <url-pattern>/echoerService</url-pattern>
-  </servlet-mapping>
-
-</web-app>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/web.xml)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<webservices version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee	http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd">
-  
-  <webservice-description>
-
-    <!-- descriptive name for the service -->
-    <webservice-description-name>Echo Service</webservice-description-name>
-    <!-- WSDL implementation file -->
-    <wsdl-file>WEB-INF/wsdl/EchoerService.wsdl</wsdl-file>
-    <!-- Java<->XML mapping file -->
-    <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-    
-    <port-component>
-
-      <!-- logical name for the port (unique within the module) -->
-      <port-component-name>echoerPort</port-component-name>
-      <!-- WSDL port element (in WSDL file) -->
-      <wsdl-port xmlns:portNS="urn:example:echo">portNS:EchoerPort</wsdl-port>
-      <!-- service endpoint interface class -->
-      <service-endpoint-interface>org.jboss.test.webservice.jbws1034.Echoer</service-endpoint-interface>
-      <!-- associated servlet (in web-app descriptor) -->
-      <service-impl-bean>
-        <servlet-link>echoerService</servlet-link>
-      </service-impl-bean>
-      
-      <handler>
-        <!-- logical name for the handler (unique within the module) -->
-        <handler-name>charsetHandler</handler-name>
-        <!-- handler class -->
-        <handler-class>org.jboss.test.webservice.jbws1034.server.CharsetHandler</handler-class>
-      </handler>
-      
-    </port-component>
-    
-  </webservice-description>
-
-</webservices>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/webservices.xml)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions name="EchoerService" targetNamespace="urn:example:echo" xmlns:tns="urn:example:echo" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <types/>
-  <message name="Echoer_echo">
-    <part name="String_1" type="xsd:string"/></message>
-  <message name="Echoer_echoResponse">
-    <part name="result" type="xsd:string"/></message>
-  <portType name="Echoer">
-    <operation name="echo" parameterOrder="String_1">
-      <input message="tns:Echoer_echo"/>
-      <output message="tns:Echoer_echoResponse"/></operation></portType>
-  <binding name="EchoerBinding" type="tns:Echoer">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-    <operation name="echo">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal" namespace="urn:example:echo"/></input>
-      <output>
-        <soap:body use="literal" namespace="urn:example:echo"/></output></operation></binding>
-  <service name="EchoerService">
-    <port name="EchoerPort" binding="tns:EchoerBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/WEB-INF/wsdl/EchoerService.wsdl)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/config.xml
===================================================================
--- branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/config.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/config.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
-  <service name="EchoerService" targetNamespace="urn:example:echo"
-    typeNamespace="urn:example:echo:types" packageName="org.jboss.test.webservice.jbws1034">
-    <interface name="org.jboss.test.webservice.jbws1034.Echoer" servantName="org.jboss.test.webservice.jbws1034.server.EchoerImpl" />
-  </service>
-</configuration>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws1034/config.xml (from rev 57272, branches/JBoss_4_0_2_JBWS-1034/testsuite/src/resources/webservice/jbws1034/config.xml)

Modified: branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-client-config.xml
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-client-config.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-client-config.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -26,6 +26,8 @@
       <handler type="java:org.jboss.axis.handlers.SOAPMonitorHandler"/>
       -->
     </responseFlow>
+    
+    <parameter name="sendXMLDeclaration" value="false" />
   </globalConfiguration>
 
   <transport name="http" pivot="java:org.jboss.axis.transport.http.HTTPSender"/>

Modified: branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-server-config.xml
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-server-config.xml	2006-09-29 02:28:50 UTC (rev 57272)
+++ branches/JBoss_4_0_2_CP/webservice/src/resources/jboss-ws4ee.sar/META-INF/axis-server-config.xml	2006-09-29 02:43:50 UTC (rev 57273)
@@ -26,6 +26,8 @@
       <handler type="java:org.jboss.axis.handlers.SOAPMonitorHandler"/>
       -->
     </responseFlow>
+    
+    <parameter name="sendXMLDeclaration" value="false" />
   </globalConfiguration>
 
   <!-- url-to-service mapping should be enabled for every incoming http traffic -->


