Author: nash
Date: Thu Dec 4 16:03:14 2008
New Revision: 723501
URL: http://svn.apache.org/viewvc?rev=723501&view=rev
Log:
Add validation test case and further updates for TUSCANY-2698
Added:
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
tuscany/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
tuscany/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
Added:
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl?rev=723501&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
(added)
+++
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
Thu Dec 4 16:03:14 2008
@@ -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&java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=tcp://localhost:61619"/>
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Added:
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite?rev=723501&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
(added)
+++
tuscany/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
Thu Dec 4 16:03:14 2008
@@ -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&java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=tcp://localhost:61619"/>
+ </service>
+ </component>
+
+</composite>
Added:
tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java?rev=723501&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
Thu Dec 4 16:03:14 2008
@@ -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());
+ }
+}
Modified:
tuscany/branches/sca-java-1.x/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.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=723501&r1=723500&r2=723501&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Thu Dec 4 16:03:14 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.x/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.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=723501&r1=723500&r2=723501&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
Thu Dec 4 16:03:14 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.x/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.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java?rev=723501&r1=723500&r2=723501&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
Thu Dec 4 16:03:14 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);
}
}
}
