You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/08/19 11:08:16 UTC
svn commit: r987094 - in /tuscany/sca-java-2.x/trunk/modules:
core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/
interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/
Author: slaws
Date: Thu Aug 19 09:08:15 2010
New Revision: 987094
URL: http://svn.apache.org/viewvc?rev=987094&view=rev
Log:
Remove commented code
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=987094&r1=987093&r2=987094&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java Thu Aug 19 09:08:15 2010
@@ -500,14 +500,7 @@ public class RuntimeEndpointImpl extends
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
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=987094&r1=987093&r2=987094&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java Thu Aug 19 09:08:15 2010
@@ -329,13 +329,6 @@ public class RuntimeEndpointReferenceImp
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
Modified: tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java?rev=987094&r1=987093&r2=987094&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java Thu Aug 19 09:08:15 2010
@@ -106,34 +106,7 @@ public class JAXWSJavaInterfaceProcessor
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;