JBossWS SVN: r4318 - stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 11:03:11 -0400 (Fri, 10 Aug 2007)
New Revision: 4318
Modified:
stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
Also try this
Modified: stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 14:10:18 UTC (rev 4317)
+++ stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-10 15:03:11 UTC (rev 4318)
@@ -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: r4317 - stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/jaxrpc/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 10:10:18 -0400 (Fri, 10 Aug 2007)
New Revision: 4317
Modified:
stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
Log:
Also try this
Modified: stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 14:02:55 UTC (rev 4316)
+++ stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-10 14:10:18 UTC (rev 4317)
@@ -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;
17 years, 4 months
- 1
- 0
JBossWS SVN: r4316 - stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-10 10:02:55 -0400 (Fri, 10 Aug 2007)
New Revision: 4316
Modified:
stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
Log:
Try this
Modified: stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 13:35:56 UTC (rev 4315)
+++ stack/native/branches/dlofthouse/JBWS-1763/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-10 14:02:55 UTC (rev 4316)
@@ -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;
@@ -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;
}
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4315 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-10 09:35:56 -0400 (Fri, 10 Aug 2007)
New Revision: 4315
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
Update
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 13:35:05 UTC (rev 4314)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 13:35:56 UTC (rev 4315)
@@ -24,3 +24,6 @@
svn merge -r4287:4288 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
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
17 years, 4 months
- 1
- 0
JBossWS SVN: r4314 - in stack/native/trunk/src: main/java/org/jboss/ws/core/server and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-10 09:35:05 -0400 (Fri, 10 Aug 2007)
New Revision: 4314
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:
svn merge -r4311:4313 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -29,7 +29,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,16 +45,19 @@
*/
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
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+
+ msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -26,12 +26,9 @@
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,17 +43,18 @@
*/
public abstract class CommonSOAP12Binding extends CommonSOAPBinding
{
-
+ private MessageFactoryImpl msgFactory;
+
public CommonSOAP12Binding()
{
+ msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
- return (MessageAbstraction)factory.createMessage();
+ msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
+ return (MessageAbstraction)msgFactory.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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -78,6 +78,15 @@
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)
{
@@ -277,9 +286,8 @@
{
WebServiceContext wsContext;
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
+ {
+ wsContext = wsCtxFactory.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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -67,13 +67,23 @@
// 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))
@@ -249,11 +259,11 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
- envBuilder.setStyle(getStyle());
+ envelopeBuilder.setStyle(getStyle());
+
// Build the payload
- envBuilder.build(soapMessage, inputStream, ignoreParseError);
+ envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
}
return soapMessage;
Modified: stack/native/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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -37,6 +37,15 @@
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;
@@ -46,8 +55,7 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+ SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Modified: stack/native/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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -104,8 +104,15 @@
// 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
@@ -376,7 +383,7 @@
}
else
{
- MessageFactoryImpl msgFactory = new MessageFactoryImpl();
+
msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
@@ -526,10 +533,8 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
- wsdlHost = config.getWebServiceHost();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
+ wsdlHost = serverConfig.getWebServiceHost();
log.debug("WSDL request, using host: " + wsdlHost);
Modified: stack/native/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 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-10 13:35:05 UTC (rev 4314)
@@ -72,10 +72,16 @@
// 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/";
@@ -241,9 +247,8 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+
+ File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -296,9 +301,7 @@
File locationFile = null;
if (predefinedLocation == false)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+ locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
}
else
{
Modified: stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-10 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-10 13:35:05 UTC (rev 4314)
@@ -1,7 +1,7 @@
<jmeterTestPlan version="1.2" properties="1.8">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="JBossWS_Benchmark" enabled="true">
- <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true">
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
<collectionProp name="Arguments.arguments">
<elementProp name="host" elementType="Argument">
<stringProp name="Argument.metadata">=</stringProp>
@@ -21,7 +21,7 @@
<stringProp name="TestPlan.comments"></stringProp>
</TestPlan>
<hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="true">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -46,7 +46,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -56,6 +55,7 @@
</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,7 +65,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -75,6 +74,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -95,8 +95,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,7 +156,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -166,6 +165,7 @@
</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,7 +175,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -185,6 +184,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -205,8 +205,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,7 +259,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -272,6 +271,7 @@
</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,7 +281,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -294,6 +293,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -314,8 +314,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,7 +368,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -381,6 +380,7 @@
</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,7 +390,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -403,6 +402,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -423,8 +423,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,7 +477,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -490,6 +489,7 @@
</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,7 +499,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -512,6 +511,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -532,8 +532,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -568,7 +568,7 @@
</ResultCollector>
<hashTree/>
</hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="false">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -593,7 +593,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -603,6 +602,7 @@
</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,7 +612,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -622,6 +621,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -642,8 +642,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,7 +703,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -713,6 +712,7 @@
</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,7 +722,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -732,6 +731,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -752,8 +752,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,7 +806,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -819,6 +818,7 @@
</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,7 +828,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -841,6 +840,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -861,8 +861,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,7 +915,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -928,6 +927,7 @@
</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,7 +937,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -950,6 +949,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -970,8 +970,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,7 +1024,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1037,6 +1036,7 @@
</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,7 +1046,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1059,6 +1058,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1079,8 +1079,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,7 +1140,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1150,6 +1149,7 @@
</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,7 +1159,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1169,6 +1168,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1189,8 +1189,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,7 +1250,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1260,6 +1259,7 @@
</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,7 +1269,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1279,6 +1278,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1299,8 +1299,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,7 +1353,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1366,6 +1365,7 @@
</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,7 +1375,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1388,6 +1387,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1408,8 +1408,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,7 +1462,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1475,6 +1474,7 @@
</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,7 +1484,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1497,6 +1496,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1517,8 +1517,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1581,7 +1581,7 @@
</value>
<name>saveConfig</name>
</objProp>
- <stringProp name="filename">/tmp/test.csv</stringProp>
+ <stringProp name="filename">/tmp/model4.csv</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-10 13:32:14 UTC (rev 4313)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-10 13:35:05 UTC (rev 4314)
@@ -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: r4313 - in stack/native/branches/native-2.0/src: main/java/org/jboss/ws/core/server and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-10 09:32:14 -0400 (Fri, 10 Aug 2007)
New Revision: 4313
Modified:
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt
Log:
Cache SPI artifacts
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-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -29,7 +29,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,16 +45,19 @@
*/
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
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+
+ msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.createMessage();
Use encStyle = opMetaData.getEndpointMetaData().getEncodingStyle();
if (Use.ENCODED.equals(encStyle))
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -26,12 +26,9 @@
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,17 +43,18 @@
*/
public abstract class CommonSOAP12Binding extends CommonSOAPBinding
{
-
+ private MessageFactoryImpl msgFactory;
+
public CommonSOAP12Binding()
{
+ msgFactory = new MessageFactoryImpl();
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
- return (MessageAbstraction)factory.createMessage();
+ msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
+ return (MessageAbstraction)msgFactory.createMessage();
}
protected abstract Set<String> getRoles();
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -78,6 +78,15 @@
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)
{
@@ -277,9 +286,8 @@
{
WebServiceContext wsContext;
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
+ {
+ wsContext = wsCtxFactory.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-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -67,13 +67,23 @@
// 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))
@@ -249,11 +259,11 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
- envBuilder.setStyle(getStyle());
+ envelopeBuilder.setStyle(getStyle());
+
// Build the payload
- envBuilder.build(soapMessage, inputStream, ignoreParseError);
+ envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
}
return soapMessage;
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -37,6 +37,15 @@
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;
@@ -46,8 +55,7 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+ SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -104,8 +104,15 @@
// 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
@@ -376,7 +383,7 @@
}
else
{
- MessageFactoryImpl msgFactory = new MessageFactoryImpl();
+
msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
@@ -526,10 +533,8 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
- wsdlHost = config.getWebServiceHost();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
+ wsdlHost = serverConfig.getWebServiceHost();
log.debug("WSDL request, using host: " + wsdlHost);
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-10 13:32:14 UTC (rev 4313)
@@ -72,10 +72,16 @@
// 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/";
@@ -241,9 +247,8 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+
+ File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -296,9 +301,7 @@
File locationFile = null;
if (predefinedLocation == false)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+ locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
}
else
{
Modified: stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-10 13:32:14 UTC (rev 4313)
@@ -1,7 +1,7 @@
<jmeterTestPlan version="1.2" properties="1.8">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="JBossWS_Benchmark" enabled="true">
- <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true">
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
<collectionProp name="Arguments.arguments">
<elementProp name="host" elementType="Argument">
<stringProp name="Argument.metadata">=</stringProp>
@@ -21,7 +21,7 @@
<stringProp name="TestPlan.comments"></stringProp>
</TestPlan>
<hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="true">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -46,7 +46,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -56,6 +55,7 @@
</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,7 +65,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -75,6 +74,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -95,8 +95,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,7 +156,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -166,6 +165,7 @@
</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,7 +175,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -185,6 +184,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -205,8 +205,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,7 +259,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -272,6 +271,7 @@
</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,7 +281,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -294,6 +293,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -314,8 +314,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,7 +368,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -381,6 +380,7 @@
</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,7 +390,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -403,6 +402,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -423,8 +423,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,7 +477,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -490,6 +489,7 @@
</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,7 +499,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -512,6 +511,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -532,8 +532,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -568,7 +568,7 @@
</ResultCollector>
<hashTree/>
</hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="false">
<longProp name="ThreadGroup.start_time">1144146988000</longProp>
<stringProp name="ThreadGroup.delay"></stringProp>
<stringProp name="ThreadGroup.duration"></stringProp>
@@ -593,7 +593,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -603,6 +602,7 @@
</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,7 +612,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -622,6 +621,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -642,8 +642,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,7 +703,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -713,6 +712,7 @@
</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,7 +722,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -732,6 +731,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -752,8 +752,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,7 +806,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -819,6 +818,7 @@
</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,7 +828,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -841,6 +840,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -861,8 +861,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,7 +915,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -928,6 +927,7 @@
</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,7 +937,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -950,6 +949,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -970,8 +970,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,7 +1024,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1037,6 +1036,7 @@
</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,7 +1046,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1059,6 +1058,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1079,8 +1079,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,7 +1140,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1150,6 +1149,7 @@
</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,7 +1159,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1169,6 +1168,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1189,8 +1189,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,7 +1250,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1260,6 +1259,7 @@
</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,7 +1269,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1279,6 +1278,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1299,8 +1299,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,7 +1353,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1366,6 +1365,7 @@
</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,7 +1375,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1388,6 +1387,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1408,8 +1408,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,7 +1462,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1475,6 +1474,7 @@
</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,7 +1484,6 @@
<SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false">
<stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp>
<stringProp name="SoapSampler.xml_data_file"></stringProp>
- <stringProp name="SoapSampler.SOAP_ACTION"></stringProp>
<stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
@@ -1497,6 +1496,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1517,8 +1517,8 @@
<stringProp name="-1984138256">Envelope</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <intProp name="Assertion.test_type">2</intProp>
<stringProp name="Assertion.assume_success">false</stringProp>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1581,7 +1581,7 @@
</value>
<name>saveConfig</name>
</objProp>
- <stringProp name="filename">/tmp/test.csv</stringProp>
+ <stringProp name="filename">/tmp/model4.csv</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
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-10 13:31:27 UTC (rev 4312)
+++ stack/native/branches/native-2.0/src/test/resources/test-excludes-jboss42.txt 2007-08-10 13:32:14 UTC (rev 4313)
@@ -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: r4312 - in container: jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-10 09:31:27 -0400 (Fri, 10 Aug 2007)
New Revision: 4312
Modified:
container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DefaultInvocationHandler.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java
Log:
Cache SPI artifacts
Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DefaultInvocationHandler.java
===================================================================
--- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DefaultInvocationHandler.java 2007-08-10 13:31:26 UTC (rev 4311)
+++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DefaultInvocationHandler.java 2007-08-10 13:31:27 UTC (rev 4312)
@@ -45,6 +45,15 @@
*/
public class DefaultInvocationHandler extends InvocationHandler
{
+ private SPIProvider spiProvider;
+ private ResourceInjectorFactory resourceInjectorFactory;
+
+ public DefaultInvocationHandler()
+ {
+ spiProvider = SPIProviderResolver.getInstance().getProvider();
+ resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ }
+
public Invocation createInvocation()
{
return new Invocation();
@@ -84,9 +93,7 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
- ResourceInjector injector = factory.newResourceInjector();
+ ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2007-08-10 13:31:26 UTC (rev 4311)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2007-08-10 13:31:27 UTC (rev 4312)
@@ -45,6 +45,15 @@
*/
public class DefaultInvocationHandler extends InvocationHandler
{
+ private SPIProvider spiProvider;
+ private ResourceInjectorFactory resourceInjectorFactory;
+
+ public DefaultInvocationHandler()
+ {
+ spiProvider = SPIProviderResolver.getInstance().getProvider();
+ resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ }
+
public Invocation createInvocation()
{
return new Invocation();
@@ -84,9 +93,8 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
- ResourceInjector injector = factory.newResourceInjector();
+
+ ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java 2007-08-10 13:31:26 UTC (rev 4311)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java 2007-08-10 13:31:27 UTC (rev 4312)
@@ -45,6 +45,15 @@
*/
public class DefaultInvocationHandler extends InvocationHandler
{
+ private SPIProvider spiProvider;
+ private ResourceInjectorFactory resourceInjectorFactory;
+
+ public DefaultInvocationHandler()
+ {
+ spiProvider = SPIProviderResolver.getInstance().getProvider();
+ resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ }
+
public Invocation createInvocation()
{
return new Invocation();
@@ -84,9 +93,7 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
- ResourceInjector injector = factory.newResourceInjector();
+ ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4311 - stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-10 09:31:26 -0400 (Fri, 10 Aug 2007)
New Revision: 4311
Modified:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
Log:
Layout code using JBossWSCodeStyle.xml
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-10 09:49:23 UTC (rev 4310)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-10 13:31:26 UTC (rev 4311)
@@ -21,36 +21,39 @@
*/
package org.jboss.test.ws.jaxws.jbws1733;
+import javax.annotation.Resource;
import javax.jws.WebService;
-import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-@WebService(name="JBWS1733", serviceName="JBWS1733Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
+@WebService(name = "JBWS1733", serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
public class JBWS1733Impl implements JBWS1733
{
-
+
@Resource
private WebServiceContext wsContext;
-
+
public int getCounter()
{
- MessageContext mc = wsContext.getMessageContext();
- HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
- // Get a session property "counter" from context
- if (session == null)
- throw new WebServiceException("No session in WebServiceContext");
- Integer counter = (Integer)session.getAttribute("counter");
- if (counter == null) {
- counter = new Integer(0);
- System.out.println("Starting the Session");
- }
- counter = new Integer(counter.intValue() + 1);
- session.setAttribute("counter", counter);
- return counter;
+ MessageContext mc = wsContext.getMessageContext();
+ HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+
+ // Get a session property "counter" from context
+ if (session == null)
+ throw new WebServiceException("No session in WebServiceContext");
+
+ Integer counter = (Integer)session.getAttribute("counter");
+ if (counter == null)
+ {
+ counter = new Integer(0);
+ System.out.println("Starting the Session");
+ }
+ counter = new Integer(counter.intValue() + 1);
+ session.setAttribute("counter", counter);
+ return counter;
}
}
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-10 09:49:23 UTC (rev 4310)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-10 13:31:26 UTC (rev 4311)
@@ -24,8 +24,8 @@
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import junit.framework.Test;
@@ -47,7 +47,7 @@
{
return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war");
}
-
+
@Override
protected void setUp() throws Exception
{
@@ -59,14 +59,13 @@
Service service = Service.create(wsdlURL, serviceName);
proxy = (JBWS1733)service.getPort(JBWS1733.class);
}
-
- public void testIssue() throws Exception {
- ((BindingProvider)proxy)
- .getRequestContext()
- .put(BindingProvider.SESSION_MAINTAIN_PROPERTY,true);
- for ( int i = 1; i <= 10; i++ ) {
- assertTrue( proxy.getCounter() == i );
+ public void testIssue() throws Exception
+ {
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true);
+ for (int i = 1; i <= 10; i++)
+ {
+ assertTrue(proxy.getCounter() == i);
}
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4310 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-10 05:49:23 -0400 (Fri, 10 Aug 2007)
New Revision: 4310
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
adding merging info of issue JBWS-1733
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 09:43:10 UTC (rev 4309)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-10 09:49:23 UTC (rev 4310)
@@ -16,3 +16,11 @@
heiko 09-August-2007
svn merge -r4281:4282 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+ropalka(a)redhat.com 10-Aug-2007
+svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4280:4281 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4282:4283 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4287:4288 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+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
17 years, 4 months
- 1
- 0
JBossWS SVN: r4309 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-10 05:43:10 -0400 (Fri, 10 Aug 2007)
New Revision: 4309
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
fix of the test compilation issue
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-10 09:21:51 UTC (rev 4308)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-10 09:43:10 UTC (rev 4309)
@@ -252,6 +252,7 @@
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<!-- FIXME jars should be available in the client dir -->
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
17 years, 4 months
- 1
- 0