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/09 18:39:03 UTC
svn commit: r983722 -
/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
Author: slaws
Date: Mon Aug 9 16:39:02 2010
New Revision: 983722
URL: http://svn.apache.org/viewvc?rev=983722&view=rev
Log:
TUSCANY-3641 - comment out part of the previous change that's causing all of the JCAA tests to fail for some reason. Also remove some old commented out code.
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java?rev=983722&r1=983721&r2=983722&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java Mon Aug 9 16:39:02 2010
@@ -328,30 +328,6 @@ public class JavaImplementationProcessor
}
}
-// private void postJAXWSProcessorResolve(ModelResolver resolver, JavaImplementation impl, ProcessorContext context)
-// throws ContributionResolveException {
-// for(Service service : impl.getServices()){
-// InterfaceContract interfaceContract = service.getInterfaceContract();
-//
-// // InterfaceContract not marked as resolved so have to look
-// // at each type and work it out
-// if (interfaceContract instanceof JavaInterfaceContract){
-// JavaInterfaceContract javaInterfaceContract = (JavaInterfaceContract)interfaceContract;
-// JavaInterface javaInterface = (JavaInterface)javaInterfaceContract.getInterface();
-// if (javaInterface.isUnresolved()){
-// extensionProcessor.resolve(javaInterfaceContract, resolver, context);
-// }
-// } else {
-// WSDLInterfaceContract wsdlInterfaceContract = (WSDLInterfaceContract)interfaceContract;
-// WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
-// if (wsdlInterface.isUnresolved()){
-// //WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlInterface.getWsdlDefinition(), context);
-// extensionProcessor.resolve(wsdlInterfaceContract, resolver, context);
-// }
-// }
-// }
-// }
-
private void postJAXWSProcessorResolve(ModelResolver resolver, JavaImplementation impl, ProcessorContext context)
throws ContributionResolveException, IncompatibleInterfaceContractException {
for(Service service : impl.getServices()){
@@ -359,7 +335,8 @@ public class JavaImplementationProcessor
JavaInterface javaInterface = (JavaInterface)javaInterfaceContract.getInterface();
if (javaInterface.isUnresolved()){
- extensionProcessor.resolve(javaInterfaceContract, resolver, context);
+// TODO - Causing JCAA tests to fail?????
+// extensionProcessor.resolve(javaInterfaceContract, resolver, context);
}
WSDLInterfaceContract wsdlInterfaceContract = (WSDLInterfaceContract)javaInterfaceContract.getNormalizedWSDLContract();