[jboss-svn-commits] JBossWS SVN: r952 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/deployment main/java/org/jboss/ws/eventing/mgmt main/java/org/jboss/ws/integration main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/metadata main/java/org/jboss/ws/server main/java/org/jboss/ws/soap main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/utils test test/java/org/jboss/test/ws/common/binding test/java/org/jboss/test/ws/common/soap/attachment test/java/org/jboss/test/ws/jaxrpc
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 13 11:57:15 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-13 11:56:45 -0400 (Wed, 13 Sep 2006)
New Revision: 952
Removed:
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/other/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java
branches/jbossws-1.0/src/test/build.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
Log:
Remove dependency on JAXWS for the core API
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBinding.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -38,22 +38,17 @@
* @author Thomas.Diesler at jboss.com
* @since 04-Jul-2006
*/
-public abstract class CommonBinding
+public interface CommonBinding
{
- /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */
- public static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http";
- /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */
- public static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
-
/** On the client side, generate the Object from IN parameters. */
- public abstract Object bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException;
+ Object bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException;
/** On the server side, extract the IN parameters from the Object and populate an Invocation object */
- public abstract EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object reqMessage) throws BindingException;
+ EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object reqMessage) throws BindingException;
/** On the server side, generate the Object from OUT parameters in the Invocation object. */
- public abstract Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException;
+ Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException;
/** On the client side, extract the OUT parameters from the Object and return them to the client. */
- public abstract void unbindResponseMessage(OperationMetaData opMetaData, Object resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException;
+ void unbindResponseMessage(OperationMetaData opMetaData, Object resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException;
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonBindingProvider.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -34,10 +34,12 @@
*/
public class CommonBindingProvider
{
- private CommonBinding binding;
+ protected EndpointMetaData epMetaData;
+ protected CommonBinding binding;
public CommonBindingProvider(EndpointMetaData epMetaData)
{
+ this.epMetaData = epMetaData;
initBinding(epMetaData.getBindingId());
}
@@ -46,13 +48,13 @@
initBinding(bindingId);
}
- private void initBinding(String bindingId)
+ protected void initBinding(String bindingId)
{
- if (CommonBinding.SOAP11HTTP_BINDING.equals(bindingId))
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
{
binding = new CommonSOAP11Binding();
}
- else if (CommonBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
{
binding = new CommonSOAP12Binding();
}
@@ -62,7 +64,7 @@
}
}
- public CommonBinding getBinding()
+ public CommonBinding getCommonBinding()
{
return binding;
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -76,9 +76,8 @@
protected QName operationName;
// Output parameters
protected EndpointInvocation epInv;
-
// The binding provider
- private CommonBindingProvider bindingProvider;
+ protected CommonBindingProvider bindingProvider;
/** Create a call that needs to be configured manually
*/
@@ -235,7 +234,7 @@
try
{
// Get the binding from the provider
- CommonBinding binding = (CommonBinding)getBindingProvider().getBinding();
+ CommonBinding binding = (CommonBinding)getCommonBindingProvider().getCommonBinding();
// Create the invocation and sync the input parameters
epInv = new EndpointInvocation(opMetaData);
@@ -345,7 +344,7 @@
}
}
- public CommonBindingProvider getBindingProvider()
+ protected CommonBindingProvider getCommonBindingProvider()
{
if (bindingProvider == null)
{
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -84,13 +84,19 @@
* @author Thomas.Diesler at jboss.com
* @since 04-Jul-2006
*/
-public abstract class CommonSOAPBinding extends CommonBinding
+public abstract class CommonSOAPBinding implements CommonBinding
{
// provide logging
private static Logger log = Logger.getLogger(CommonSOAPBinding.class);
private boolean mtomEnabled;
+ /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */
+ public static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
+
+ /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */
+ public static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http";
+
public MessageFactory getMessageFactory()
{
return new MessageFactoryImpl();
@@ -634,10 +640,10 @@
{
String envNS = soapEnvelope.getNamespaceURI();
String bindingId = opMetaData.getEndpointMetaData().getBindingId();
- if (CommonBinding.SOAP11HTTP_BINDING.equals(bindingId) && Constants.NS_SOAP11_ENV.equals(envNS) == false)
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && Constants.NS_SOAP11_ENV.equals(envNS) == false)
log.warn("Expected SOAP-1.1 envelope, but got: " + envNS);
- if (CommonBinding.SOAP12HTTP_BINDING.equals(bindingId) && Constants.NS_SOAP12_ENV.equals(envNS) == false)
+ if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) && Constants.NS_SOAP12_ENV.equals(envNS) == false)
log.warn("Expected SOAP-1.2 envelope, but got: " + envNS);
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.deployment;
-// $Id$
+// $Id: $
import java.io.IOException;
import java.net.MalformedURLException;
@@ -49,7 +49,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
-import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.deployment.EventingEndpoint;
import org.jboss.ws.eventing.metadata.EventingEpMetaExt;
@@ -153,9 +153,9 @@
WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName());
String bindingType = wsdlBinding.getType();
if (Constants.NS_SOAP11.equals(bindingType))
- epMetaData.setBindingId(CommonBinding.SOAP11HTTP_BINDING);
+ epMetaData.setBindingId(CommonSOAPBinding.SOAP11HTTP_BINDING);
else if (Constants.NS_SOAP12.equals(bindingType))
- epMetaData.setBindingId(CommonBinding.SOAP12HTTP_BINDING);
+ epMetaData.setBindingId(CommonSOAPBinding.SOAP12HTTP_BINDING);
}
/** Initialize the endpoint encoding style from the binding operations
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -77,7 +77,6 @@
{
String eventXML = DOMWriter.printNode(event, false);
MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
// notification elements need to declare their namespace locally
StringBuilder sb = new StringBuilder();
@@ -96,7 +95,7 @@
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(sb.toString().getBytes()));
URL epURL = notifyTo.getAddress().toURL();
- ((SOAPConnectionImpl)con).callOneWay(reqMsg, epURL);
+ new SOAPConnectionImpl().callOneWay(reqMsg, epURL);
}
catch (Exception e)
{
@@ -165,10 +164,9 @@
try
{
MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(sb.toString().getBytes()));
URL epURL = endTo.getAddress().toURL();
- ((SOAPConnectionImpl)con).callOneWay(reqMsg, epURL);
+ new SOAPConnectionImpl().callOneWay(reqMsg, epURL);
}
catch (Exception e)
{
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -93,7 +93,7 @@
// Bind the response message
CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData());
- CommonBinding binding = (CommonBinding)bindingProvider.getBinding();
+ CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding();
SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv);
msgContext.setSOAPMessage(resMessage);
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -46,6 +46,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.binding.UnboundHeader;
+import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.common.CommonClient;
import org.jboss.ws.jaxrpc.handler.HandlerChainBaseImpl;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -35,7 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.Use;
@@ -109,7 +109,7 @@
this.type = type;
// The default binding
- this.bindingId = CommonBinding.SOAP11HTTP_BINDING;
+ this.bindingId = CommonSOAPBinding.SOAP11HTTP_BINDING;
}
public ServiceMetaData getServiceMetaData()
@@ -161,7 +161,7 @@
public void setBindingId(String bindingId)
{
- if (!CommonBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ if (!CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) && !CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
throw new WSException("Unsupported binding: " + bindingId);
this.bindingId = bindingId;
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -129,7 +129,7 @@
if (handlersPass)
{
// Get the binding from the provideer
- binding = (CommonBinding)bindingProvider.getBinding();
+ binding = bindingProvider.getCommonBinding();
// Get the operation meta data from the SOAP message
opMetaData = getDispatchDestination(epMetaData, reqMessage);
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SAAJPayloadBuilderDOM.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -35,10 +35,9 @@
import javax.xml.soap.SOAPHeader;
import org.jboss.logging.Logger;
-import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
-import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.Style;
+import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.utils.DOMWriter;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -52,7 +51,7 @@
public class SAAJPayloadBuilderDOM implements PayloadBuilder
{
// provide logging
- private static Logger log = Logger.getLogger(CommonSOAPBinding.class);
+ private static Logger log = Logger.getLogger(SAAJPayloadBuilderDOM.class);
private Style style = Style.DOCUMENT;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -40,7 +40,7 @@
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.common.CommonBinding;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
@@ -130,9 +130,9 @@
wsdl.registerNamespaceURI(Constants.NS_SCHEMA_XSD, Constants.PREFIX_XSD);
if (wsdlNamespace.equals(Constants.NS_WSDL11))
{
- if (CommonBinding.SOAP11HTTP_BINDING.equals(bindingId))
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
wsdl.registerNamespaceURI(Constants.NS_SOAP11, Constants.PREFIX_SOAP11);
- else if (CommonBinding.SOAP12HTTP_BINDING.equals(bindingId))
+ else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
wsdl.registerNamespaceURI(Constants.NS_SOAP12, Constants.PREFIX_SOAP12);
}
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -206,7 +206,7 @@
}
if(null == converter)
- throw new WSException("No ByteArrayConverter for content type: " + contentType);
+ throw new WSException("No ByteArrayConverter for content type: " + contentType);
return converter;
}
@@ -291,7 +291,7 @@
}
br.close();
-
+
converted = sb.toString();
}
catch (IOException e)
@@ -349,4 +349,4 @@
}
-}
\ No newline at end of file
+}
Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/test/build.xml 2006-09-13 15:56:45 UTC (rev 952)
@@ -18,7 +18,7 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
-
+
<property name="build.dir" value="${basedir}/output"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.test.dir" value="${build.dir}/tests"/>
@@ -98,7 +98,7 @@
</target>
<!--
- Init the various classpaths
+ Init the various classpaths
-->
<target name="init" depends="prepare,thirdparty">
@@ -111,11 +111,13 @@
<isset property="HAVE_JDK_1.5"/>
</condition>
+ <!-- Check that the latest build has been deployed -->
<condition property="jbossws.deployed">
<filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
- </condition>
- <fail message="jbossws not delpoyed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/>
-
+ </condition>
+ <fail message="jbossws not delpoyed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/>
+
+ <!-- Define excluded tests -->
<property name="jbossws.target.server.${jbossws.target.server}" value="true"/>
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt">
<isset property="jbossws.target.server.jboss"/>
@@ -201,7 +203,6 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
- <!--exclude name="org/jboss/test/ws/benchmark/**"/-->
<exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -41,6 +41,7 @@
import org.jboss.ws.common.CommonBinding;
import org.jboss.ws.common.CommonBindingProvider;
import org.jboss.ws.common.CommonMessageContext;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.CallImpl;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.metadata.OperationMetaData;
@@ -166,7 +167,7 @@
*/
public void testBindRequestMessage() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.initInputParams(new Object[]{"Hello World!"});
@@ -184,7 +185,7 @@
*/
public void testBindRequestMessageWithBoundHeader() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
// Add bound header
QName xmlName = new QName("http://somens", "String_2");
@@ -208,7 +209,7 @@
*/
public void testBindRequestMessageWithUnboundHeader() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
// Add unbound header
QName xmlName = new QName("http://somens", "String_2");
@@ -234,7 +235,7 @@
*/
public void testUnbindRequestMessage() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelope.getBytes());
@@ -270,7 +271,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage);
assertNotNull(epInv);
@@ -292,7 +293,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
msgContext.setSOAPMessage(reqMessage);
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage);
assertNotNull(epInv);
@@ -305,7 +306,7 @@
*/
public void testBindResponseMessage() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.setReturnValue("Hello World!");
@@ -323,7 +324,7 @@
*/
public void testUnbindResponseMessage() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelope.getBytes());
@@ -342,7 +343,7 @@
*/
public void testUnbindResponseMessageWithBoundHeader() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithBoundHeader.getBytes());
@@ -371,7 +372,7 @@
*/
public void testUnbindResponseMessageWithUnboundHeader() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithUnboundHeader.getBytes());
@@ -398,7 +399,7 @@
*/
public void testUnbindFaultResponse() throws Exception
{
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP12HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING).getCommonBinding();
ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithFault.getBytes());
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-09-13 15:42:44 UTC (rev 951)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2006-09-13 15:56:45 UTC (rev 952)
@@ -44,6 +44,7 @@
import org.jboss.ws.binding.EndpointInvocation;
import org.jboss.ws.common.CommonBinding;
import org.jboss.ws.common.CommonBindingProvider;
+import org.jboss.ws.common.CommonSOAPBinding;
import org.jboss.ws.jaxrpc.CallImpl;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.metadata.OperationMetaData;
@@ -144,7 +145,7 @@
MessageContextAssociation.pushMessageContext(messageContext);
messageContext.setOperationMetaData(opMetaData);
- CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonBinding.SOAP11HTTP_BINDING).getBinding();
+ CommonBinding binding = (CommonBinding)new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING).getCommonBinding();
EndpointInvocation epInv = new EndpointInvocation(opMetaData);
epInv.initInputParams(new Object[]{"Hello World!", "hi"});
More information about the jboss-svn-commits
mailing list