From bb2aadc32654a0e70ab209cb3cbcecdc768068b9 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 Dec 2008 00:03:14 +0000
Subject: Add validation test case and further updates for TUSCANY-2698

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723501 13f79535-47bb-0310-9956-ffa450edef68
---
 .../wsxml/MissingImportedXSD/helloworld.wsdl       | 76 ++++++++++++++++++++++
 .../MissingImportedXSD/helloworldwsjms.composite   | 34 ++++++++++
 .../binding/wsxml/MissingImportedXSDTestCase.java  | 64 ++++++++++++++++++
 .../binding/ws/xml/WebServiceBindingProcessor.java |  8 +--
 .../wsdl/xml/WSDLInterfaceProcessor.java           | 10 ++-
 .../impl/ContributionContentProcessor.java         |  4 +-
 6 files changed, 189 insertions(+), 7 deletions(-)
 create mode 100644 branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
 create mode 100644 branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
 create mode 100644 branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java

diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl b/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
new file mode 100644
index 0000000000..ce3689afff
--- /dev/null
+++ b/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	name="helloworld">
+
+    <wsdl:types>
+        <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
+            <import namespace="http://helloworld" schemaLocation="missing.xsd" />
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorld">
+        <wsdl:operation name="getGreetings">
+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
+        <wsdl:operation name="getGreetings">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="getGreetingsRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="getGreetingsResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldService">
+        <wsdl:port binding="tns:HelloWorldSoapJmsBinding" name="HelloWorldSoapJmsPort">
+            <wsdlsoap:address location="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
+        </wsdl:port>
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite b/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
new file mode 100644
index 0000000000..61a9dae367
--- /dev/null
+++ b/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://helloworld"
+	xmlns:hw="http://helloworld"
+    name="helloworldws">
+
+    <component name="HelloWorldServiceComponent">
+        <implementation.java class="binding.jms.HelloWorldServiceImpl" />
+	    <service name="HelloWorldService">
+	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
+            <binding.ws wsdlElement="http://helloworld#wsdl.service(HelloWorldService)"
+                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
+        </service>
+    </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
new file mode 100644
index 0000000000..0ceae597fb
--- /dev/null
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package binding.wsxml;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
+
+import domain.CustomCompositeBuilder;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class MissingImportedXSDTestCase extends TestCase {
+	
+    private CustomCompositeBuilder customDomain;
+    
+    @Override
+    protected void setUp() throws Exception 
+    {
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite", 
+                    "TestContribution", "src/main/resources/binding/wsxml/MissingImportedXSD/");
+        } catch (Exception ex) {
+            //throw ex;
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        //node.stop();
+    }
+
+    public void testCalculator() {
+    	Monitor monitor = customDomain.getMonitorInstance();
+
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(0);
+    	assertNotNull(problem);
+        assertEquals("ContributionResolveException", problem.getMessageId());
+
+        problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
+        assertNotNull(problem);
+        assertEquals("InvalidInterfaceException", problem.getMessageId());
+    }
+}
diff --git a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 860daa647d..980003ddf1 100644
--- a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
@@ -343,10 +343,10 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
         } 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 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
                 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);
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 14f7d4ff5c..be80606343 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
@@ -201,8 +201,14 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
                 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());
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index 880e95480e..d0f769c9d1 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
@@ -195,8 +195,10 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri
             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);
                 }
             }
         }
-- 
cgit v1.2.3