svn commit: r723908 - in /tuscany/branches/sca-java-1.4: itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/ itest/validation/src/test/java/binding/wsxml/ modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/ mod...

[na...@apache.org]

Author: nash
Date: Fri Dec  5 14:35:54 2008
New Revision: 723908

URL: http://svn.apache.org/viewvc?rev=723908&view=rev
Log:
Merge r723501 changes for TUSCANY-2698 into the 1.4 branch

Added:
    tuscany/branches/sca-java-1.4/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/
      - copied from r723501, tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/
    tuscany/branches/sca-java-1.4/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
      - copied unchanged from r723501, tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
    tuscany/branches/sca-java-1.4/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
      - copied unchanged from r723501, tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
    tuscany/branches/sca-java-1.4/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
      - copied unchanged from r723501, tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
Modified:
    tuscany/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
    tuscany/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
    tuscany/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java

Modified: tuscany/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=723908&r1=723907&r2=723908&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java (original)
+++ tuscany/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java Fri Dec  5 14:35:54 2008
@@ -343,10 +343,10 @@
         } catch (ContributionRuntimeException e) {
             ContributionResolveException ce = new ContributionResolveException(e.getCause());
             error("ContributionResolveException", wsdlDefinition, ce);
-            throw ce;
+            //throw ce;
         }                        
 
-        if (!resolved.isUnresolved()) {
+        if (resolved != null && !resolved.isUnresolved()) {
             wsdlDefinition.setDefinition(resolved.getDefinition());
             wsdlDefinition.setLocation(resolved.getLocation());
             wsdlDefinition.setURI(resolved.getURI());
@@ -388,11 +388,11 @@
                 WSDLInterface wsdlInterface = null;
                 try {
                     wsdlInterface = wsdlFactory.createWSDLInterface(portType, wsdlDefinition, resolver);
+                    interfaceContract.setInterface(wsdlInterface);
+                    model.setBindingInterfaceContract(interfaceContract);
                 } catch (InvalidInterfaceException e) {
                 	warning("InvalidInterfaceException", wsdlFactory, model.getName()); 
                 }
-                interfaceContract.setInterface(wsdlInterface);
-                model.setBindingInterfaceContract(interfaceContract);
             }
         }
         policyProcessor.resolvePolicies(model, resolver);

Modified: tuscany/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=723908&r1=723907&r2=723908&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ tuscany/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Fri Dec  5 14:35:54 2008
@@ -201,8 +201,14 @@
                 WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
                 wsdlDefinition.setUnresolved(true);
                 wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI());
-                WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);
-                if (!resolved.isUnresolved()) {
+                WSDLDefinition resolved = null;
+                try {
+                    resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);
+                } catch (ContributionRuntimeException e) {
+                    ContributionResolveException ce = new ContributionResolveException(e.getCause());
+                    error("ContributionResolveException", wsdlDefinition, ce);
+                }
+                if (resolved != null && !resolved.isUnresolved()) {
                     wsdlDefinition.setDefinition(resolved.getDefinition());
                     wsdlDefinition.setLocation(resolved.getLocation());
                     wsdlDefinition.setURI(resolved.getURI());

Modified: tuscany/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java?rev=723908&r1=723907&r2=723908&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java (original)
+++ tuscany/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java Fri Dec  5 14:35:54 2008
@@ -195,8 +195,10 @@
             if (model != null) {
                 try {
                    artifactProcessor.resolve(model, contributionResolver);
+                } catch (ContributionResolveException e) {
+                    throw e;
                 } catch (Exception e) {
-                    //FIXME this shouldn't happen
+                    throw new ContributionResolveException(e);
                 }
             }
         }