diff options
Diffstat (limited to 'sca-java-2.x/trunk')
3 files changed, 2 insertions, 43 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index 44dbeda11f..219b67edff 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -500,14 +500,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint boolean bindingHasCallback = bindingContract.getCallbackInterface() != null; - try { -/* - interfaceContractMapper.checkCompatibility(getGeneratedWSDLContract(serviceContract), - getGeneratedWSDLContract(bindingContract), - Compatibility.SUBSET, - !bindingHasCallback, // ignore callbacks if binding doesn't have one - false); -*/ + try { // Use the normalized contract if the interface types are different or if // a normalized contract has been previously generate, for example, by virtue diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 5f5bbb19ce..0277c37962 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -329,13 +329,6 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen boolean bindingHasCallback = bindingContract.getCallbackInterface() != null; try { -/* - interfaceContractMapper.checkCompatibility(getGeneratedWSDLContract(referenceContract), - getGeneratedWSDLContract(bindingContract), - Compatibility.SUBSET, - !bindingHasCallback, // ignore callbacks if binding doesn't have one - false); -*/ // Use the normalized contract if the interface types are different or if // a normalized contract has been previously generate, for example, by virtue // of finding a JAXWS annotation on a Java class that references a WSDL file diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java index f1ffd6e1d4..f18ea0118f 100644 --- a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java +++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java @@ -106,34 +106,7 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor { final Class<?> clazz = contract.getJavaClass(); contract = JAXWSUtils.configureJavaInterface(contract, clazz); - String tns = contract.getQName().getNamespaceURI(); - - // TODO - the following code repeats the name determination code in the - // utils class. Do name determination separately from interface config. - // - determine service name - // - determine interface class name - // - determine wsdl file name -/* - WebService webService = clazz.getAnnotation(WebService.class); - String tns = JavaXMLMapper.getNamespace(clazz); - String localName = clazz.getSimpleName(); - if (webService != null) { - tns = getValue(webService.targetNamespace(), tns); - localName = getValue(webService.name(), localName); - contract.setQName(new QName(tns, localName)); - // Mark SEI as Remotable - contract.setRemotable(true); - } - - WebServiceProvider webServiceProvider = clazz.getAnnotation(WebServiceProvider.class); - if (webServiceProvider != null) { - tns = getValue(webServiceProvider.targetNamespace(), tns); - localName = getValue(webServiceProvider.serviceName(), localName); - contract.setQName(new QName(tns, localName)); - // Mark SEI as Remotable - contract.setRemotable(true); - } -*/ + String tns = contract.getQName().getNamespaceURI(); if (!contract.isRemotable()) { return; |