[jbossws-commits] JBossWS SVN: r4340 - in stack/native/branches/native-2.0/src: main/java/org/jboss/ws/core/server and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Aug 13 11:24:16 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-08-13 11:24:16 -0400 (Mon, 13 Aug 2007)
New Revision: 4340

Modified:
   stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
   stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
   stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
Log:
Restore revisited SPI factory caching

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -29,7 +29,6 @@
 import javax.xml.soap.SOAPEnvelope;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
 
 import org.jboss.ws.Constants;
 import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,16 +45,18 @@
  */
 public abstract class CommonSOAP11Binding extends CommonSOAPBinding
 {
+   private MessageFactoryImpl msgFactory;
+
    public CommonSOAP11Binding()
    {
+      msgFactory = new MessageFactoryImpl();
+      msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
    }
 
    /** Create the SOAP-1.1 message */
    protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
    {
-      MessageFactoryImpl factory = new MessageFactoryImpl();
-      factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
-      SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+      SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.createMessage();
       
       Use encStyle = opMetaData.getEndpointMetaData().getEncodingStyle();
       if (Use.ENCODED.equals(encStyle))

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -26,12 +26,9 @@
 import java.util.Set;
 
 import javax.xml.namespace.QName;
-import javax.xml.rpc.soap.SOAPFaultException;
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
 import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
 
 import org.jboss.ws.Constants;
 import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,17 +43,18 @@
  */
 public abstract class CommonSOAP12Binding extends CommonSOAPBinding
 {
-   
+   private MessageFactoryImpl msgFactory;
+
    public CommonSOAP12Binding()
    {
+      msgFactory = new MessageFactoryImpl();
+      msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
    }
 
    /** Create the SOAP-1.1 message */
    protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
    {
-      MessageFactoryImpl factory = new MessageFactoryImpl();
-      factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
-      return (MessageAbstraction)factory.createMessage();
+      return (MessageAbstraction)msgFactory.createMessage();
    }
 
    protected abstract Set<String> getRoles();

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -23,9 +23,31 @@
 
 // $Id$
 
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.http.HTTPBinding;
+
 import org.jboss.logging.Logger;
 import org.jboss.ws.Constants;
-import org.jboss.ws.core.*;
+import org.jboss.ws.core.CommonBinding;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPBinding;
+import org.jboss.ws.core.CommonSOAPFaultException;
+import org.jboss.ws.core.DirectionHolder;
+import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.MessageAbstraction;
 import org.jboss.ws.core.DirectionHolder.Direction;
 import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
 import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC;
@@ -45,25 +67,15 @@
 import org.jboss.wsf.common.JavaUtils;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
 
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.http.HTTPBinding;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
 /** An implementation handles invocations on the endpoint
  *
  * @author Thomas.Diesler at jboss.org
@@ -78,6 +90,14 @@
    protected CommonBindingProvider bindingProvider;
    protected ServerHandlerDelegate delegate;
 
+   private WebServiceContextFactory contextFactory;
+
+   public ServiceEndpointInvoker()
+   {
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      contextFactory = spiProvider.getSPI(WebServiceContextFactory.class);
+   }
+
    /** Initialize the service endpoint */
    public void init(Endpoint endpoint)
    {
@@ -275,22 +295,15 @@
       {
          if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE)
          {
-            WebServiceContext wsContext;
             if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
             {
-               SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-               wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
-                 InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext
-               );
+               WebServiceContext wsContext = contextFactory.newWebServiceContext(InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext);
+               invContext.addAttachment(WebServiceContext.class, wsContext);
             }
             else
             {
-               // TODO: This is an ESB case, they require a custom MessageContext
-               // that works independed of MessageContext.SERVLET_REQUEST
-               throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+
-               "You should provide a custom spi.invocation.InvocationHandlerFactory");
+               log.warn("Cannot provide WebServiceContext, since the current MessageContext does not provide a ServletRequest");
             }
-            invContext.addAttachment(WebServiceContext.class, wsContext);
          }
          invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext);
       }

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -67,20 +67,26 @@
    // Used if the style is dynamic
    private boolean dynamic;
 
+   private EnvelopeBuilder envelopeBuilder;
+
    public MessageFactoryImpl()
    {
       envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
+      envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
    }
 
    public MessageFactoryImpl(String protocol) throws SOAPException
    {
+      envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
+
       if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol) || SOAPConstants.DEFAULT_SOAP_PROTOCOL.equals(protocol))
          envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
       else if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol))
          envNamespace = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE;
       else if (SOAPConstants.DYNAMIC_SOAP_PROTOCOL.equals(protocol))
          dynamic = true;
-      else throw new SOAPException("Unknown protocol: " + protocol);
+      else
+         throw new SOAPException("Unknown protocol: " + protocol);
    }
 
    /**
@@ -249,11 +255,11 @@
             soapMessage.setAttachments(attachments);
 
          // Get the SOAPEnvelope builder
-         EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
-         envBuilder.setStyle(getStyle());
 
+         envelopeBuilder.setStyle(getStyle());
+
          // Build the payload
-         envBuilder.build(soapMessage, inputStream, ignoreParseError);
+         envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
       }
 
       return soapMessage;

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -26,28 +26,32 @@
 import org.jboss.ws.extensions.security.element.SecurityHeader;
 import org.jboss.ws.extensions.security.element.Token;
 import org.jboss.ws.extensions.security.element.UsernameToken;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.invocation.SecurityAdaptor;
 import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
 import org.w3c.dom.Document;
 
 public class ReceiveUsernameOperation implements TokenOperation
 {
    private SecurityHeader header;
    private SecurityStore store;
+   
+   private SecurityAdaptorFactory secAdapterfactory;
 
    public ReceiveUsernameOperation(SecurityHeader header, SecurityStore store)
    {
       this.header = header;
       this.store = store;
+
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
    }
 
    public void process(Document message, Token token) throws WSSecurityException
    {
       UsernameToken user = (UsernameToken)token;
-      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-      SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+      SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
       securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
       securityAdaptor.setCredential(user.getPassword());
    }

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -104,8 +104,14 @@
    // provide logging
    private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
 
+   private ServerConfig serverConfig;
+   private MessageFactoryImpl msgFactory;
+
    RequestHandlerImpl()
    {
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+      msgFactory = new MessageFactoryImpl();
    }
 
    public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
@@ -376,7 +382,7 @@
          }
          else
          {
-            MessageFactoryImpl msgFactory = new MessageFactoryImpl();
+
             msgFactory.setServiceMode(sepMetaData.getServiceMode());
             msgFactory.setStyle(sepMetaData.getStyle());
 
@@ -526,10 +532,8 @@
          if (reqURL.getPort() != -1)
             wsdlHost += ":" + reqURL.getPort();
 
-         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-         ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-         if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
-            wsdlHost = config.getWebServiceHost();
+         if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
+            wsdlHost = serverConfig.getWebServiceHost();
          
          log.debug("WSDL request, using host: " + wsdlHost);
 

Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java	2007-08-13 15:24:16 UTC (rev 4340)
@@ -71,11 +71,16 @@
    private ArchiveDeployment dep;
    // The expected wsdl location in the deployment
    private String expLocation;
+   // The server config
+   private ServerConfig serverConfig;
 
    public WSDLFilePublisher(ArchiveDeployment dep)
    {
       this.dep = dep;
-
+      
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+      
       if (dep.getType().toString().endsWith("JSE"))
       {
          expLocation = "WEB-INF/wsdl/";
@@ -241,9 +246,8 @@
    public void unpublishWsdlFiles() throws IOException
    {
       String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
-      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-      ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-      File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+
+      File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
       deleteWsdlPublishDirectory(serviceDir);
    }
 
@@ -296,9 +300,7 @@
       File locationFile = null;
       if (predefinedLocation == false)
       {
-         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-         ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-         locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+         locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
       }
       else
       {

Modified: stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx	2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx	2007-08-13 15:24:16 UTC (rev 4340)
@@ -1,7 +1,7 @@
 <jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="JBossWS_Benchmark" enabled="true">
-      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments">
           <elementProp name="host" elementType="Argument">
             <stringProp name="Argument.metadata">=</stringProp>
@@ -21,7 +21,7 @@
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="true">
         <longProp name="ThreadGroup.start_time">1144146988000</longProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
@@ -46,7 +46,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -56,6 +55,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -65,7 +65,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -75,6 +74,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -86,8 +86,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -95,8 +95,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,7 +156,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -166,6 +165,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -175,7 +175,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -185,6 +184,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -196,8 +196,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -205,8 +205,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,7 +259,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -272,6 +271,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -281,7 +281,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -294,6 +293,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -305,8 +305,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -314,8 +314,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,7 +368,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -381,6 +380,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -390,7 +390,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -403,6 +402,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -414,8 +414,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -423,8 +423,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,7 +477,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -490,6 +489,7 @@
         &lt;/ns1:echoArrayOfSimpleUserType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -499,7 +499,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -512,6 +511,7 @@
         &lt;/ns1:echoArrayOfSimpleUserType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -523,8 +523,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -532,8 +532,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -568,7 +568,7 @@
         </ResultCollector>
         <hashTree/>
       </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="false">
         <longProp name="ThreadGroup.start_time">1144146988000</longProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
@@ -593,7 +593,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -603,6 +602,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -612,7 +612,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -622,6 +621,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -633,8 +633,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -642,8 +642,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,7 +703,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -713,6 +712,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -722,7 +722,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -732,6 +731,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -743,8 +743,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -752,8 +752,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,7 +806,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -819,6 +818,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -828,7 +828,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -841,6 +840,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -852,8 +852,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -861,8 +861,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,7 +915,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -928,6 +927,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -937,7 +937,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -950,6 +949,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -961,8 +961,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -970,8 +970,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,7 +1024,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1037,6 +1036,7 @@
         &lt;/ns1:echoArrayOfSimpleUserType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1046,7 +1046,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1059,6 +1058,7 @@
         &lt;/ns1:echoArrayOfSimpleUserType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1070,8 +1070,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1079,8 +1079,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,7 +1140,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1150,6 +1149,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1159,7 +1159,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1169,6 +1168,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1180,8 +1180,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1189,8 +1189,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,7 +1250,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1260,6 +1259,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1269,7 +1269,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1279,6 +1278,7 @@
         &lt;/ns1:getOrder&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1290,8 +1290,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1299,8 +1299,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,7 +1353,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1366,6 +1365,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1375,7 +1375,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1388,6 +1387,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1399,8 +1399,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1408,8 +1408,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,7 +1462,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1475,6 +1474,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1484,7 +1484,6 @@
         <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
           <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
           <stringProp name="SoapSampler.xml_data_file"></stringProp>
-          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <stringProp name="HTTPSamper.xml_data">&lt;env:Envelope xmlns:env=&apos;http://schemas.xmlsoap.org/soap/envelope/&apos;&gt;
     &lt;env:Header/&gt;
     &lt;env:Body&gt;
@@ -1497,6 +1496,7 @@
         &lt;/ns1:echoSimpleType&gt;
     &lt;/env:Body&gt;
 &lt;/env:Envelope&gt;</stringProp>
+          <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -1508,8 +1508,8 @@
             <stringProp name="49586">200</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1517,8 +1517,8 @@
             <stringProp name="-1984138256">Envelope</stringProp>
           </collectionProp>
           <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <intProp name="Assertion.test_type">2</intProp>
           <stringProp name="Assertion.assume_success">false</stringProp>
-          <intProp name="Assertion.test_type">2</intProp>
         </ResponseAssertion>
         <hashTree/>
         <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1581,7 +1581,7 @@
           </value>
           <name>saveConfig</name>
         </objProp>
-        <stringProp name="filename">/tmp/test.csv</stringProp>
+        <stringProp name="filename">/tmp/model4.csv</stringProp>
         <boolProp name="ResultCollector.error_logging">false</boolProp>
       </ResultCollector>
       <hashTree/>




More information about the jbossws-commits mailing list