JBossWS SVN: r14853 - framework/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-16 02:59:37 -0400 (Tue, 16 Aug 2011)
New Revision: 14853
Added:
framework/tags/jbossws-framework-3.1.2.SP10/
Log:
Tag jbossws-framework-3.1.2.SP10
13 years, 8 months
JBossWS SVN: r14851 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-16 02:50:08 -0400 (Tue, 16 Aug 2011)
New Revision: 14851
Added:
common/tags/jbossws-common-1.1.0.SP8/
Log:
Tag jbossws-common-1.1.0.SP8
13 years, 8 months
JBossWS SVN: r14849 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-16 02:33:17 -0400 (Tue, 16 Aug 2011)
New Revision: 14849
Added:
spi/tags/jbossws-spi-1.1.2.SP7/
Log:
Tag jbossws-spi-1.1.2.SP7
13 years, 8 months
JBossWS SVN: r14848 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-16 00:37:55 -0400 (Tue, 16 Aug 2011)
New Revision: 14848
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBPAPP-5779]:JBossWS-EPR's address is NOT used for invocations on the endpoint when the dispatchImpl is created with EPR
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-08-15 17:02:58 UTC (rev 14847)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-08-16 04:37:55 UTC (rev 14848)
@@ -526,6 +526,12 @@
NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr);
portName = nepr.getEndpointName();
+ //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint
+ if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0)
+ {
+ getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress());
+ }
+
Dispatch<T> dispatch = createDispatch(portName, type, mode);
initAddressingProperties(dispatch, epr);
initWebserviceFeatures(dispatch, features);
@@ -546,7 +552,11 @@
QName portName = null;
NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr);
portName = nepr.getEndpointName();
-
+ //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint
+ if (getEndpointMetaData(portName) != null && nepr.getAddress() != null
+ && nepr.getAddress().length() > 0) {
+ getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress());
+ }
Dispatch<Object> dispatch = createDispatch(portName, context, mode);
initAddressingProperties(dispatch, epr);
initWebserviceFeatures(dispatch, features);
13 years, 8 months
JBossWS SVN: r14847 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2011-08-15 13:02:58 -0400 (Mon, 15 Aug 2011)
New Revision: 14847
Modified:
stack/native/branches/jbossws-native-3.1.2/
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java
Log:
[JBPAPP-5866] Removing redundant namespace declarations
Property changes on: stack/native/branches/jbossws-native-3.1.2
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183
+ /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183
+ /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-08-15 15:01:43 UTC (rev 14846)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-08-15 17:02:58 UTC (rev 14847)
@@ -21,6 +21,10 @@
*/
package org.jboss.ws.core.soap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.xml.namespace.QName;
import javax.xml.soap.Detail;
import javax.xml.soap.Name;
@@ -34,6 +38,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.wsf.common.DOMUtils;
+import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -153,10 +158,39 @@
}
}
}
-
+ Iterator ite = soapElement.getNamespacePrefixes();
+ List<String> prefixs = new ArrayList<String>();
+ while (ite != null && ite.hasNext())
+ {
+ prefixs.add((String) ite.next());
+ }
+ removeNSAttribute(soapElement, prefixs);
return soapElement;
}
+ private void removeNSAttribute(SOAPElement soapElement, List<String> prefixes)
+ {
+ Iterator ite2 = soapElement.getChildElements();
+ while (ite2 != null && ite2.hasNext())
+ {
+ Object obj = ite2.next();
+ if (obj instanceof SOAPElement)
+ {
+ SOAPElement ele = (SOAPElement) obj;
+ removeNSAttribute(ele, prefixes);
+ for (String str : prefixes)
+ {
+ Attr attr = ele.getAttributeNode("xmlns:" + str);
+ if (attr != null)
+ ele.removeAttribute("xmlns:" + str);
+
+ }
+ }
+
+ }
+
+ }
+
@Override
public Detail createDetail() throws SOAPException
{
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183
+ /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2011-08-15 15:01:43 UTC (rev 14846)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2011-08-15 17:02:58 UTC (rev 14847)
@@ -21,12 +21,21 @@
*/
package org.jboss.test.ws.common.soap;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.soap.Detail;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPFactory;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
/**
* Test the SOAPFactory
@@ -84,5 +93,28 @@
assertEquals("pre", name.getPrefix());
assertEquals("http://someURI", name.getURI());
}
+
+
+ public void testNSDeclaration() throws Exception
+ {
+ String CONTENTS =
+ "<say:sayHiResponse xmlns:say='http://www.jboss.org/sayHi' xmlns:say2='http://www.jboss.org/sayHi2'>" +
+ "<say2:arg0><say2:arg2>Response</say2:arg2></say2:arg0>" +
+ "</say:sayHiResponse>" ;
+
+ DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance() ;
+ builderFactory.setNamespaceAware(true);
+ DocumentBuilder builder = builderFactory.newDocumentBuilder() ;
+
+ Document doc = builder.parse(new InputSource(new StringReader(CONTENTS))) ;
+ Element root = doc.getDocumentElement() ;
+
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement soapElement = factory.createElement(root) ;
+ NodeList elementList = soapElement.getElementsByTagName("say2:arg2");
+ Element element = (Element)elementList.item(0);
+ Attr attr = element.getAttributeNode("xmlns:say2");
+ assertNull(attr);
+ }
}
13 years, 8 months
JBossWS SVN: r14846 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/core/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2011-08-15 11:01:43 -0400 (Mon, 15 Aug 2011)
New Revision: 14846
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
Log:
JBPAPP-6860 - Backed out changes due to test failing when running TCK JAX-WS tests.
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -32,7 +32,6 @@
{
private QName faultCode;
private String faultString;
- private Throwable throwable;
public CommonSOAPFaultException(QName faultCode, String faultString)
{
@@ -42,15 +41,6 @@
this.faultString = faultString;
}
- public CommonSOAPFaultException(QName faultCode, Throwable throwable) {
-
- super(throwable.getMessage(), throwable);
-
- this.faultCode = faultCode;
- this.throwable = throwable;
-
- }
-
public QName getFaultCode()
{
return faultCode;
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -264,14 +264,7 @@
throw new WSTimeoutException("Timeout after: " + timeout + "ms", new Long(timeout.toString()));
}
- IOException io = null;
-
- if(th.getCause().getMessage() != null) {
- io = new IOException(th.getCause().getMessage());
- }else {
- io = new IOException("Could not transmit message");
- }
-
+ IOException io = new IOException("Could not transmit message");
io.initCause(th);
throw io;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -91,7 +91,7 @@
return null;
}
QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new CommonSOAPFaultException(faultCode, ex);
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -287,10 +287,6 @@
SOAPBody soapBody = soapEnv.getBody();
- if (soapBody == null) {
- soapBody = soapEnv.addBody();
- }
-
if (atPartMargin())
{
// the env:Body element
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -288,15 +288,6 @@
{
envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
}
- //if inputstream is empty, no need to build
- if (inputStream.markSupported()) {
- inputStream.mark(1);
- final int bytesRead = inputStream.read(new byte[1]);
- inputStream.reset();
- if (bytesRead == -1) {
- return soapMessage;
- }
- }
// Build the payload
envBuilder.setStyle(getStyle());
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -47,7 +47,7 @@
try
{
- SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, false);
+ SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, true);
return soapMsg;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-15 12:59:55 UTC (rev 14845)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-15 15:01:43 UTC (rev 14846)
@@ -79,8 +79,7 @@
if (resCode != HttpServletResponse.SC_NO_CONTENT)
{
MimeHeaders mimeHeaders = getMimeHeaders(metadata);
- //[JBWS-2651] modify the ignoreParseError to false
- soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, false);
+ soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, true);
}
return soapMsg;
13 years, 8 months
JBossWS SVN: r14845 - container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-15 08:59:55 -0400 (Mon, 15 Aug 2011)
New Revision: 14845
Modified:
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
Log:
[JBWS-3338] @Addressing annotation propagation
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-08-15 12:37:12 UTC (rev 14844)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-08-15 12:59:55 UTC (rev 14845)
@@ -386,13 +386,18 @@
final Addressing addressingSBMD = portComponentSBMD.getAddressing();
if (addressingSBMD != null)
{
+ portComponentUMDM.setAddressingAnnotationSpecified(true);
portComponentUMDM.setAddressingEnabled(addressingSBMD.isEnabled());
portComponentUMDM.setAddressingRequired(addressingSBMD.isRequired());
portComponentUMDM.setAddressingResponses(addressingSBMD.getResponses());
}
// propagate respect binding properties
- portComponentUMDM.setRespectBindingEnabled(portComponentSBMD.isRespectBindingEnabled());
+ if (portComponentSBMD.isRespectBindingEnabled())
+ {
+ portComponentUMDM.setRespectBindingAnnotationSpecified(true);
+ portComponentUMDM.setRespectBindingEnabled(true);
+ }
// propagate link
portComponentUMDM.setPortComponentLink(portComponentSBMD.getLink());
13 years, 8 months
JBossWS SVN: r14844 - common/trunk/src/main/java/org/jboss/ws/common/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-15 08:37:12 -0400 (Mon, 15 Aug 2011)
New Revision: 14844
Modified:
common/trunk/src/main/java/org/jboss/ws/common/serviceref/AbstractServiceObjectFactoryJAXWS.java
Log:
[JBWS-3338] construct ports using features properly
Modified: common/trunk/src/main/java/org/jboss/ws/common/serviceref/AbstractServiceObjectFactoryJAXWS.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2011-08-15 12:23:15 UTC (rev 14843)
+++ common/trunk/src/main/java/org/jboss/ws/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2011-08-15 12:37:12 UTC (rev 14844)
@@ -193,7 +193,9 @@
Class<?> retType = method.getReturnType();
if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
{
- port = method.invoke(target, new Object[0]);
+ final Method targetMethod = getMethodFor(methodName, features, serviceClass);
+ final Object[] args = getArgumentsFor(features);
+ port = targetMethod.invoke(target, args);
retVal = port;
break;
}
@@ -202,7 +204,7 @@
if (port == null)
{
- Method method = getMethodFor(portQName, features, serviceClass);
+ Method method = getMethodFor("getPort", portQName, features, serviceClass);
Object[] args = getArgumentsFor(portQName, features, targetClass);
port = method.invoke(target, args);
retVal = port;
@@ -347,25 +349,38 @@
return null;
}
- private Method getMethodFor(final QName portQName, final WebServiceFeature[] features, final Class<?> serviceClass)
+ private Method getMethodFor(final String methodName, final QName portQName, final WebServiceFeature[] features, final Class<?> serviceClass)
throws NoSuchMethodException
{
if ((portQName == null) && (features == null))
- return serviceClass.getMethod("getPort", new Class[]
+ return serviceClass.getMethod(methodName, new Class[]
{Class.class});
if ((portQName != null) && (features == null))
- return serviceClass.getMethod("getPort", new Class[]
+ return serviceClass.getMethod(methodName, new Class[]
{QName.class, Class.class});
if ((portQName == null) && (features != null))
- return serviceClass.getMethod("getPort", new Class[]
+ return serviceClass.getMethod(methodName, new Class[]
{Class.class, WebServiceFeature[].class});
if ((portQName != null) && (features != null))
- return serviceClass.getMethod("getPort", new Class[]
+ return serviceClass.getMethod(methodName, new Class[]
{QName.class, Class.class, WebServiceFeature[].class});
throw new IllegalStateException();
}
+ private Method getMethodFor(final String methodName, final WebServiceFeature[] features, final Class<?> serviceClass)
+ throws NoSuchMethodException
+ {
+ if (features == null)
+ {
+ return serviceClass.getMethod(methodName, new Class[] {});
+ }
+ else
+ {
+ return serviceClass.getMethod(methodName, new Class[] { WebServiceFeature[].class } );
+ }
+ }
+
private Object[] getArgumentsFor(final QName portQName, final WebServiceFeature[] features,
final Class<?> targetClass) throws NoSuchMethodException
{
@@ -385,6 +400,18 @@
throw new IllegalStateException();
}
+ private Object[] getArgumentsFor(final WebServiceFeature[] features) throws NoSuchMethodException
+ {
+ if (features == null)
+ {
+ return new Object[] {};
+ }
+ else
+ {
+ return new Object[] {features};
+ }
+ }
+
private WebServiceFeature[] getFeatures(final UnifiedServiceRefMetaData serviceRef)
{
List<WebServiceFeature> features = new LinkedList<WebServiceFeature>();
@@ -427,8 +454,9 @@
{
List<WebServiceFeature> features = new LinkedList<WebServiceFeature>();
// configure @Addressing feature
- if (portComponentRefMD.isAddressingEnabled())
+ if (portComponentRefMD.isAddressingAnnotationSpecified())
{
+ final boolean enabled = portComponentRefMD.isAddressingEnabled();
final boolean required = portComponentRefMD.isAddressingRequired();
final String refResponses = portComponentRefMD.getAddressingResponses();
AddressingFeature.Responses responses = AddressingFeature.Responses.ALL;
@@ -437,7 +465,7 @@
if ("NON_ANONYMOUS".equals(refResponses))
responses = AddressingFeature.Responses.NON_ANONYMOUS;
- features.add(new AddressingFeature(true, required, responses));
+ features.add(new AddressingFeature(enabled, required, responses));
}
// configure @MTOM feature
@@ -447,9 +475,10 @@
}
// configure @RespectBinding feature
- if (portComponentRefMD.isRespectBindingEnabled())
+ if (portComponentRefMD.isRespectBindingAnnotationSpecified())
{
- features.add(new RespectBindingFeature(true));
+ final boolean enabled = portComponentRefMD.isRespectBindingEnabled();
+ features.add(new RespectBindingFeature(enabled));
}
return features.size() == 0 ? null : features.toArray(new WebServiceFeature[]
13 years, 8 months