Fix TUSCANY-2698

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@721944 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 11 deletions

diff --git a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index e04a4d6743..14f7d4ff5c 100644
--- a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
@@ -34,6 +34,7 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionRuntimeException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
@@ -62,9 +63,9 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
     /**
      * Report a warning.
      * 
-     * @param problems
-     * @param message
+     * @param problem
      * @param model
+     * @param message data
      */
     private void warning(String message, Object model, Object... messageParameters) {
         if (monitor != null) {
@@ -74,11 +75,11 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
      }
     
     /**
-     * Report a error.
+     * Report an error.
      * 
-     * @param problems
-     * @param message
+     * @param problem
      * @param model
+     * @param message data
      */
     private void error(String message, Object model, Object... messageParameters) {
         if (monitor != null) {
@@ -88,11 +89,11 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
      }
    
    /**
-    * Report a exception.
+    * Report an exception.
     * 
-    * @param problems
-    * @param message
+    * @param problem
     * @param model
+    * @param exception
     */
     private void error(String message, Object model, Exception ex) {
         if (monitor != null) {
@@ -217,9 +218,12 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
                             wsdlInterface = wsdlFactory.createWSDLInterface(portType.getElement(), wsdlDefinition, resolver);
                             wsdlInterface.setWsdlDefinition(wsdlDefinition);
                             resolver.addModel(wsdlInterface);
+                        } catch (ContributionRuntimeException e) {
+                            ContributionResolveException ce = new ContributionResolveException(e.getCause());
+                            error("ContributionResolveException", wsdlDefinition, ce);
                         } catch (InvalidInterfaceException e) {
                         	ContributionResolveException ce = new ContributionResolveException(e);
-                        	error("ContributionResolveException", wsdlFactory, ce);
+                        	error("ContributionResolveException", wsdlDefinition, ce);
                             //throw ce;
                         }                        
                     }
diff --git a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
index 2f8c3e0500..7355d3390d 100644
--- a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
@@ -19,6 +19,6 @@
 #
 #
 ContributionReadException = ContributionReadException occured due to :
-ContributionResolveException = ContributionResolveException occured due to :
+ContributionResolveException = Error in contribution: {0}
 InvalidWSDLInterfaceAttr = Invalid WSDL interface attribute: {0}
-WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions
\ No newline at end of file
+WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions