JBossWS SVN: r4328 - in stack/native/branches/native-2.0/src/test/resources/jaxws: jbws1762 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-13 06:54:00 -0400 (Mon, 13 Aug 2007)
New Revision: 4328
Added:
stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/
stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/
stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml
Log:
[JBWS-1762] adding new test DD
Added: stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2007-08-13 10:54:00 UTC (rev 4328)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>JBWS1762Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1762.JBWS1762Impl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBWS1762Service</servlet-name>
+ <url-pattern>/JBWS1762Service</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
- 1
- 0
JBossWS SVN: r4327 - in stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws: jbws1762 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-13 06:51:28 -0400 (Mon, 13 Aug 2007)
New Revision: 4327
Added:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java
Log:
[JBWS-1762] Adding new test
Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java 2007-08-13 10:51:28 UTC (rev 4327)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1762;
+
+import javax.jws.WebService;
+
+@WebService
+public interface JBWS1762
+{
+
+ String echo(String toEcho);
+
+}
Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java 2007-08-13 10:51:28 UTC (rev 4327)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1762;
+
+import javax.jws.WebService;
+
+@WebService(name = "JBWS1762", serviceName = "JBWS1762Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1762.JBWS1762")
+public class JBWS1762Impl implements JBWS1762
+{
+
+ public String echo(String toEcho)
+ {
+ return toEcho;
+ }
+
+}
Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-13 10:51:28 UTC (rev 4327)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1762;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
+ *
+ * @author Richard.Opalka(a)jboss.com
+ * @since 13-Aug-2007
+ */
+public class JBWS1762TestCase1 extends JBossWSTest
+{
+
+ private String targetNS = "http://jbws1762.jaxws.ws.test.jboss.org/";
+ private JBWS1762 proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1762TestCase1.class, "jaxws-jbws1762.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1762Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1762/JBWS1762Service?wsdl");
+
+ if (true) {
+ System.out.println("FIXME: [JBWS-1762] Fix this issue");
+ return;
+ }
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (JBWS1762)service.getPort(JBWS1762.class);
+ }
+
+ public void testIssue() throws Exception
+ {
+ if (true) {
+ System.out.println("FIXME: [JBWS-1762] Fix this issue");
+ return;
+ }
+ assertEquals(proxy.echo("Hello!"), "Hello!");
+ }
+
+}
Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java (rev 0)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java 2007-08-13 10:51:28 UTC (rev 4327)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1762;
+
+/**
+ * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
+ *
+ * @author Richard.Opalka(a)jboss.com
+ * @since 13-Aug-2007
+ */
+public class JBWS1762TestCase2 extends JBWS1762TestCase1 {}
Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase2.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
- 1
- 0
JBossWS SVN: r4326 - in stack/native/branches/native-2.0: src/main/java/org/jboss/ws/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 05:27:32 -0400 (Mon, 13 Aug 2007)
New Revision: 4326
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
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
stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt
Log:
Rollback: Cache SPI artifacts
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-13 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-13 09:27:32 UTC (rev 4326)
@@ -25,8 +25,5 @@
svn merge -r4304:4305 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4305:4306 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
-heiko 10-August-2007
-svn merge -r4311:4313 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
-
darran.lofthouse(a)jboss.com 10-August-2007
svn merge -r4318:4319 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -29,6 +29,7 @@
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;
@@ -45,19 +46,16 @@
*/
public abstract class CommonSOAP11Binding extends CommonSOAPBinding
{
- private MessageFactoryImpl msgFactory;
-
public CommonSOAP11Binding()
{
- msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
-
- msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.createMessage();
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -26,9 +26,12 @@
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;
@@ -43,18 +46,17 @@
*/
public abstract class CommonSOAP12Binding extends CommonSOAPBinding
{
- private MessageFactoryImpl msgFactory;
-
+
public CommonSOAP12Binding()
{
- msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
- return (MessageAbstraction)msgFactory.createMessage();
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
+ return (MessageAbstraction)factory.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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -78,15 +78,6 @@
protected CommonBindingProvider bindingProvider;
protected ServerHandlerDelegate delegate;
- private SPIProvider spiProvider;
- private WebServiceContextFactory wsCtxFactory;
-
- public ServiceEndpointInvoker()
- {
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsCtxFactory = spiProvider.getSPI(WebServiceContextFactory.class);
- }
-
/** Initialize the service endpoint */
public void init(Endpoint endpoint)
{
@@ -286,8 +277,9 @@
{
WebServiceContext wsContext;
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
- {
- wsContext = wsCtxFactory.newWebServiceContext(
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -67,23 +67,13 @@
// 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))
@@ -259,11 +249,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
- envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
+ envBuilder.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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -37,15 +37,6 @@
private SecurityHeader header;
private SecurityStore store;
- private SPIProvider spiProvider;
- private SecurityAdaptorFactory secAdapterfactory;
-
- public ReceiveUsernameOperation()
- {
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
- }
-
public ReceiveUsernameOperation(SecurityHeader header, SecurityStore store)
{
this.header = header;
@@ -55,7 +46,8 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -104,15 +104,8 @@
// provide logging
private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
- private SPIProvider spiProvider;
- private ServerConfig serverConfig;
- private MessageFactoryImpl msgFactory;
-
RequestHandlerImpl()
{
- 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
@@ -383,7 +376,7 @@
}
else
{
-
+ MessageFactoryImpl msgFactory = new MessageFactoryImpl();
msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
@@ -533,8 +526,10 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
- wsdlHost = serverConfig.getWebServiceHost();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
+ wsdlHost = config.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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-13 09:27:32 UTC (rev 4326)
@@ -72,16 +72,10 @@
// The expected wsdl location in the deployment
private String expLocation;
- private SPIProvider spiProvider;
-
- private ServerConfig serverConfig;
-
public WSDLFilePublisher(ArchiveDeployment dep)
{
this.dep = dep;
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-
+
if (dep.getType().toString().endsWith("JSE"))
{
expLocation = "WEB-INF/wsdl/";
@@ -247,8 +241,9 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
-
- File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -301,7 +296,9 @@
File locationFile = null;
if (predefinedLocation == false)
{
- locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ locationFile = new File(config.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 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-13 09:27:32 UTC (rev 4326)
@@ -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="User Defined Variables" enabled="true">
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" 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="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -46,6 +46,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -55,7 +56,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -65,6 +65,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -74,7 +75,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,6 +156,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -165,7 +166,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -175,6 +175,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -184,7 +185,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,6 +259,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -271,7 +272,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -281,6 +281,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -293,7 +294,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,6 +368,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -380,7 +381,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -390,6 +390,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -402,7 +403,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,6 +477,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -489,7 +490,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -499,6 +499,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -511,7 +512,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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="false">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -593,6 +593,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -602,7 +603,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -612,6 +612,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -621,7 +622,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,6 +703,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -712,7 +713,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -722,6 +722,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -731,7 +732,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,6 +806,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -818,7 +819,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -828,6 +828,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -840,7 +841,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,6 +915,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -927,7 +928,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -937,6 +937,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -949,7 +950,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,6 +1024,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1036,7 +1037,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1046,6 +1046,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1058,7 +1059,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,6 +1140,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1149,7 +1150,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1159,6 +1159,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1168,7 +1169,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,6 +1250,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1259,7 +1260,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1269,6 +1269,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1278,7 +1279,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,6 +1353,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1365,7 +1366,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1375,6 +1375,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1387,7 +1388,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,6 +1462,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1474,7 +1475,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1484,6 +1484,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1496,7 +1497,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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/model4.csv</stringProp>
+ <stringProp name="filename">/tmp/test.csv</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
Modified: stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt 2007-08-13 09:26:12 UTC (rev 4325)
+++ stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt 2007-08-13 09:27:32 UTC (rev 4326)
@@ -1,5 +1,5 @@
# benchmark tests
-#org/jboss/test/ws/benchmark/**
+org/jboss/test/ws/benchmark/**
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/jbws1581/**
17 years, 4 months
- 1
- 0
JBossWS SVN: r4325 - in stack/native/trunk/src: main/java/org/jboss/ws/core/server and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 05:26:12 -0400 (Mon, 13 Aug 2007)
New Revision: 4325
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
Log:
Rollback: Cache SPI artifacts
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -29,6 +29,7 @@
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;
@@ -45,19 +46,16 @@
*/
public abstract class CommonSOAP11Binding extends CommonSOAPBinding
{
- private MessageFactoryImpl msgFactory;
-
public CommonSOAP11Binding()
{
- msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
-
- msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.createMessage();
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
Use encStyle = opMetaData.getEndpointMetaData().getEncodingStyle();
if (Use.ENCODED.equals(encStyle))
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -26,9 +26,12 @@
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;
@@ -43,18 +46,17 @@
*/
public abstract class CommonSOAP12Binding extends CommonSOAPBinding
{
- private MessageFactoryImpl msgFactory;
-
+
public CommonSOAP12Binding()
{
- msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
- return (MessageAbstraction)msgFactory.createMessage();
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
+ return (MessageAbstraction)factory.createMessage();
}
protected abstract Set<String> getRoles();
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -78,15 +78,6 @@
protected CommonBindingProvider bindingProvider;
protected ServerHandlerDelegate delegate;
- private SPIProvider spiProvider;
- private WebServiceContextFactory wsCtxFactory;
-
- public ServiceEndpointInvoker()
- {
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsCtxFactory = spiProvider.getSPI(WebServiceContextFactory.class);
- }
-
/** Initialize the service endpoint */
public void init(Endpoint endpoint)
{
@@ -286,8 +277,9 @@
{
WebServiceContext wsContext;
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
- {
- wsContext = wsCtxFactory.newWebServiceContext(
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext
);
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -67,23 +67,13 @@
// 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))
@@ -259,11 +249,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
- envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
+ envBuilder.build(soapMessage, inputStream, ignoreParseError);
}
return soapMessage;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -37,15 +37,6 @@
private SecurityHeader header;
private SecurityStore store;
- private SPIProvider spiProvider;
- private SecurityAdaptorFactory secAdapterfactory;
-
- public ReceiveUsernameOperation()
- {
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
- }
-
public ReceiveUsernameOperation(SecurityHeader header, SecurityStore store)
{
this.header = header;
@@ -55,7 +46,8 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -104,15 +104,8 @@
// provide logging
private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
- private SPIProvider spiProvider;
- private ServerConfig serverConfig;
- private MessageFactoryImpl msgFactory;
-
RequestHandlerImpl()
{
- 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
@@ -383,7 +376,7 @@
}
else
{
-
+ MessageFactoryImpl msgFactory = new MessageFactoryImpl();
msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
@@ -533,8 +526,10 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
- wsdlHost = serverConfig.getWebServiceHost();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
+ wsdlHost = config.getWebServiceHost();
log.debug("WSDL request, using host: " + wsdlHost);
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-13 09:26:12 UTC (rev 4325)
@@ -72,16 +72,10 @@
// The expected wsdl location in the deployment
private String expLocation;
- private SPIProvider spiProvider;
-
- private ServerConfig serverConfig;
-
public WSDLFilePublisher(ArchiveDeployment dep)
{
this.dep = dep;
- spiProvider = SPIProviderResolver.getInstance().getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-
+
if (dep.getType().toString().endsWith("JSE"))
{
expLocation = "WEB-INF/wsdl/";
@@ -247,8 +241,9 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
-
- File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -301,7 +296,9 @@
File locationFile = null;
if (predefinedLocation == false)
{
- locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
}
else
{
Modified: stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-13 09:26:12 UTC (rev 4325)
@@ -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="User Defined Variables" enabled="true">
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" 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="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -46,6 +46,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -55,7 +56,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -65,6 +65,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -74,7 +75,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,6 +156,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -165,7 +166,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -175,6 +175,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -184,7 +185,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,6 +259,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -271,7 +272,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -281,6 +281,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -293,7 +294,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,6 +368,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -380,7 +381,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -390,6 +390,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -402,7 +403,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,6 +477,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -489,7 +490,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -499,6 +499,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -511,7 +512,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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="false">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -593,6 +593,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -602,7 +603,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -612,6 +612,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -621,7 +622,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,6 +703,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -712,7 +713,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -722,6 +722,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -731,7 +732,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,6 +806,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -818,7 +819,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -828,6 +828,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -840,7 +841,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,6 +915,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -927,7 +928,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -937,6 +937,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -949,7 +950,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,6 +1024,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1036,7 +1037,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1046,6 +1046,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1058,7 +1059,6 @@
</ns1:echoArrayOfSimpleUserType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,6 +1140,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1149,7 +1150,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1159,6 +1159,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1168,7 +1169,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,6 +1250,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1259,7 +1260,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1269,6 +1269,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1278,7 +1279,6 @@
</ns1:getOrder>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,6 +1353,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1365,7 +1366,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1375,6 +1375,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1387,7 +1388,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,6 +1462,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1474,7 +1475,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments">
<collectionProp name="Arguments.arguments"/>
</elementProp>
@@ -1484,6 +1484,7 @@
<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"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1496,7 +1497,6 @@
</ns1:echoSimpleType>
</env:Body>
</env:Envelope></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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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>
+ <stringProp name="Assertion.assume_success">false</stringProp>
<intProp name="Assertion.test_type">2</intProp>
- <stringProp name="Assertion.assume_success">false</stringProp>
</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/model4.csv</stringProp>
+ <stringProp name="filename">/tmp/test.csv</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-10 16:38:29 UTC (rev 4324)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-13 09:26:12 UTC (rev 4325)
@@ -1,5 +1,5 @@
# benchmark tests
-#org/jboss/test/ws/benchmark/**
+org/jboss/test/ws/benchmark/**
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/jbws1581/**
17 years, 4 months
- 1
- 0
JBossWS SVN: r4324 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 12:38:29 -0400 (Fri, 10 Aug 2007)
New Revision: 4324
Removed:
stack/native/branches/dlofthouse/JBWS-1763/
Log:
No longer required.
17 years, 4 months
- 1
- 0
JBossWS SVN: r4323 - in stack/native/trunk: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 12:29:39 -0400 (Fri, 10 Aug 2007)
New Revision: 4323
Modified:
stack/native/trunk/.classpath
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
[JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8.
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/.classpath 2007-08-10 16:29:39 UTC (rev 4323)
@@ -38,5 +38,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-10 16:29:39 UTC (rev 4323)
@@ -143,8 +143,8 @@
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 16:29:39 UTC (rev 4323)
@@ -27,6 +27,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import javax.xml.transform.stream.StreamResult;
@@ -51,7 +52,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
}
catch (IOException e)
{
@@ -85,6 +86,16 @@
public String toString()
{
- return baos.toString();
+ String result = null;
+ try
+ {
+ result = baos.toString("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return result;
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-10 16:29:39 UTC (rev 4323)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 16:29:39 UTC (rev 4323)
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -112,7 +113,16 @@
{
String retStr = null;
if (bytes != null)
- retStr = new String(bytes);
+ {
+ try
+ {
+ retStr = new String(bytes, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 16:29:14 UTC (rev 4322)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 16:29:39 UTC (rev 4323)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream());
+ reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
}
char[] cbuf = new char[1024];
17 years, 4 months
- 1
- 0
JBossWS SVN: r4322 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 12:29:14 -0400 (Fri, 10 Aug 2007)
New Revision: 4322
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
[JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8.
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 16:24:47 UTC (rev 4321)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 16:29:14 UTC (rev 4322)
@@ -27,3 +27,6 @@
heiko 10-August-2007
svn merge -r4311:4313 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+darran.lofthouse(a)jboss.com 10-August-2007
+svn merge -r4318:4319 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
17 years, 4 months
- 1
- 0
JBossWS SVN: r4321 - container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-10 12:24:47 -0400 (Fri, 10 Aug 2007)
New Revision: 4321
Modified:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
Log:
Fix JBWS-1747:WebMetaDataAdapter doesn't check if there's a J2eeApplicationMetaData instance set on the DeploymentInfo parent
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2007-08-10 16:10:38 UTC (rev 4320)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2007-08-10 16:24:47 UTC (rev 4321)
@@ -60,12 +60,15 @@
if (di.parent != null)
{
J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData;
- Iterator it = appmd.getModules();
- while (it.hasNext())
+ if(appmd!=null) // An ESB case, They deploy a *.war inside *.esb
{
- J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
- if (module.getFileName().equals(dep.getSimpleName()))
- contextRoot = module.getWebContext();
+ Iterator it = appmd.getModules();
+ while (it.hasNext())
+ {
+ J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
+ if (module.getFileName().equals(dep.getSimpleName()))
+ contextRoot = module.getWebContext();
+ }
}
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4320 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 12:10:38 -0400 (Fri, 10 Aug 2007)
New Revision: 4320
Added:
legacy/branches/jbossws-1.2.1.GA_CP/
Log:
Create the cumulative patch branch for JBossWS 1.2.1.GA
Copied: legacy/branches/jbossws-1.2.1.GA_CP (from rev 4319, legacy/tags/jbossws-1.2.1.GA)
17 years, 4 months
- 1
- 0
JBossWS SVN: r4319 - in stack/native/branches/native-2.0: src/main/java/org/jboss/ws/core/binding and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 11:48:41 -0400 (Fri, 10 Aug 2007)
New Revision: 4319
Modified:
stack/native/branches/native-2.0/.classpath
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
[JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8.
Modified: stack/native/branches/native-2.0/.classpath
===================================================================
--- stack/native/branches/native-2.0/.classpath 2007-08-10 15:03:11 UTC (rev 4318)
+++ stack/native/branches/native-2.0/.classpath 2007-08-10 15:48:41 UTC (rev 4319)
@@ -38,5 +38,6 @@
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/>
<classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 15:03:11 UTC (rev 4318)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 15:48:41 UTC (rev 4319)
@@ -27,6 +27,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import javax.xml.transform.stream.StreamResult;
@@ -51,7 +52,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
}
catch (IOException e)
{
@@ -85,6 +86,16 @@
public String toString()
{
- return baos.toString();
+ String result = null;
+ try
+ {
+ result = baos.toString("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return result;
}
}
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-10 15:03:11 UTC (rev 4318)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-10 15:48:41 UTC (rev 4319)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 15:03:11 UTC (rev 4318)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 15:48:41 UTC (rev 4319)
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -112,7 +113,16 @@
{
String retStr = null;
if (bytes != null)
- retStr = new String(bytes);
+ {
+ try
+ {
+ retStr = new String(bytes, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 15:03:11 UTC (rev 4318)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 15:48:41 UTC (rev 4319)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream());
+ reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
}
char[] cbuf = new char[1024];
17 years, 4 months
- 1
- 0