Author: lresende
Date: Thu Aug 23 15:57:54 2007
New Revision: 569179
URL: http://svn.apache.org/viewvc?rev=569179&view=rev
Log:
TUSCANY-1108 - Adding the provided StockExceptionTest.wsdl to validate case is
working
Added:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
(with props)
Modified:
incubator/tuscany/java/sca/itest/wsdl2java/pom.xml
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
Modified: incubator/tuscany/java/sca/itest/wsdl2java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl2java/pom.xml?rev=569179&r1=569178&r2=569179&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/wsdl2java/pom.xml Thu Aug 23 15:57:54 2007
@@ -94,7 +94,7 @@
<version>1.0-incubating-SNAPSHOT</version>
<executions>
<execution>
- <id>generate-sdo</id>
+ <id>generate-sdo-account-service</id>
<phase>generate-sources</phase>
<configuration>
<schemaFile>${basedir}/src/test/resources/AccountService.wsdl</schemaFile>
@@ -109,6 +109,22 @@
<goal>generate</goal>
</goals>
</execution>
+ <execution>
+ <id>generate-sdo-stock-exception</id>
+ <phase>generate-sources</phase>
+ <configuration>
+
<schemaFile>${basedir}/src/test/resources/StockExceptionTest.wsdl</schemaFile>
+
<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
+ <prefix>Stock</prefix>
+ <noInterfaces>true</noInterfaces>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
@@ -125,6 +141,9 @@
</wsdlFile>
<wsdlFile>
<fileName>${basedir}/src/test/resources/AccountServiceWithFault.wsdl</fileName>
+ </wsdlFile>
+ <wsdlFile>
+
<fileName>${basedir}/src/test/resources/StockExceptionTest.wsdl</fileName>
</wsdlFile>
</wsdlFiles>
</configuration>
Modified:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl?rev=569179&r1=569178&r2=569179&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
Thu Aug 23 15:57:54 2007
@@ -1,21 +1,21 @@
<?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.
+ * 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 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
@@ -28,12 +28,11 @@
<xsd:schema targetNamespace="http://www.bigbank.com/account";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/account";>
-
+
<xsd:element name="getAccountReport">
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
+ <xsd:element name="customerID"
type="xsd:int" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -61,7 +60,7 @@
</xsd:complexType>
<xsd:complexType name="StockSummary">
- <!-- xsd:attribute name="id" type="xsd:int" / -->
+ <!-- xsd:attribute name="id" type="xsd:int" /
-->
<xsd:attribute name="purchaseLotNumber"
type="xsd:int" />
<!-- unique id for this purchase -->
<xsd:attribute name="symbol" type="xsd:string"
/>
@@ -72,7 +71,7 @@
<xsd:attribute name="company" type="xsd:string"
/>
<xsd:attribute name="highPrice"
type="xsd:float" />
<xsd:attribute name="lowPrice" type="xsd:float"
/>
-
+
</xsd:complexType>
<!-- Profile in data base -->
@@ -120,16 +119,16 @@
<xsd:element name="balance"
type="xsd:float" />
</xsd:sequence>
</xsd:complexType>
- </xsd:element>
- <!-- @start added fault -->
- <xsd:element name="insufficientFundsFault">
- <xsd:complexType name="insufficientFundsFault">
- <xsd:sequence>
- <xsd:element name="message"
type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <!-- @end added fault -->
+ </xsd:element>
+ <!-- @start added fault -->
+ <xsd:element name="insufficientFundsFault">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="message"
type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <!-- @end added fault -->
<xsd:element name="deposit">
<xsd:complexType>
@@ -152,7 +151,8 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element name="id"
type="xsd:int" />
- <xsd:element name="stock"
type="account:StockSummary" />
+ <xsd:element name="stock"
+
type="account:StockSummary" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -183,13 +183,13 @@
<xsd:sequence>
<xsd:element
name="customerProfile"
type="account:CustomerProfileData" />
- <xsd:element name="createSavings"
+ <xsd:element
name="createSavings"
type="xsd:boolean" />
- <xsd:element name="createCheckings"
+ <xsd:element
name="createCheckings"
type="xsd:boolean" />
</xsd:sequence>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
<xsd:element name="createAccountResponse">
<xsd:complexType>
<xsd:sequence>
@@ -197,14 +197,13 @@
type="account:CustomerProfileData" />
</xsd:sequence>
</xsd:complexType>
-
+
</xsd:element>
<xsd:element name="getAccountLog">
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
+ <xsd:element name="customerID"
type="xsd:int" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -223,7 +222,7 @@
type="account:AccountLogEntry"
maxOccurs="unbounded" />
<xsd:element name="stockLogEntries"
type="account:StockLogEntry"
maxOccurs="unbounded" />
-
+
</xsd:sequence>
</xsd:complexType>
@@ -271,13 +270,14 @@
<wsdl:message name="withdrawResponse">
<wsdl:part element="account:withdrawResponse"
name="withdrawResponse" />
- </wsdl:message>
+ </wsdl:message>
- <!-- @start added fault -->
- <wsdl:message name="insufficientFundsFault">
- <wsdl:part element="account:insufficientFundsFault"
name="insufficientFundsFault" />
- </wsdl:message>
- <!-- @end added fault -->
+ <!-- @start added fault -->
+ <wsdl:message name="insufficientFundsFault">
+ <wsdl:part element="account:insufficientFundsFault"
+ name="insufficientFundsFault" />
+ </wsdl:message>
+ <!-- @end added fault -->
<wsdl:message name="depositRequest">
<wsdl:part element="account:deposit" name="depositRequest" />
@@ -301,20 +301,22 @@
<wsdl:message name="sellStockRequest">
<wsdl:part element="account:sellStock" name="sellStockRequest"
/>
</wsdl:message>
-
+
<wsdl:message name="createAccountRequest">
- <wsdl:part element="account:createAccount"
name="createAccountRequest" />
+ <wsdl:part element="account:createAccount"
+ name="createAccountRequest" />
</wsdl:message>
<wsdl:message name="createAccountResponse">
- <wsdl:part element="account:createAccountResponse"
name="createAccountResponse" />
+ <wsdl:part element="account:createAccountResponse"
+ name="createAccountResponse" />
</wsdl:message>
<wsdl:message name="getAccountLogRequest">
<wsdl:part element="account:getAccountLog"
name="getAccountLogRequest" />
</wsdl:message>
-
+
<wsdl:message name="getAccountLogResponse">
<wsdl:part element="account:getAccountLogResponse"
name="getAccountLogResponse" />
@@ -333,10 +335,11 @@
<wsdl:operation name="withdraw">
<wsdl:input message="account:withdrawRequest" />
- <wsdl:output message="account:withdrawResponse" />
- <!-- @start added fault -->
- <wsdl:fault message="account:insufficientFundsFault"
name="insufficientFundsFault"/>
- <!-- @end added fault -->
+ <wsdl:output message="account:withdrawResponse" />
+ <!-- @start added fault -->
+ <wsdl:fault message="account:insufficientFundsFault"
+ name="insufficientFundsFault" />
+ <!-- @end added fault -->
</wsdl:operation>
<wsdl:operation name="deposit">
@@ -369,7 +372,8 @@
- <wsdl:binding name="AccountServiceWithFaultSOAP"
type="account:AccountServiceWithFault">
+ <wsdl:binding name="AccountServiceWithFaultSOAP"
+ type="account:AccountServiceWithFault">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"; />
<wsdl:operation name="getAccountReport">
@@ -401,12 +405,12 @@
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
- </wsdl:output>
- <!-- @start added fault -->
- <wsdl:fault name="insufficientFundsFault">
- <soap:fault name="insufficientFundsFault"
use="literal"/>
- </wsdl:fault>
- <!-- @end added fault -->
+ </wsdl:output>
+ <!-- @start added fault -->
+ <wsdl:fault name="insufficientFundsFault">
+ <soap:fault name="insufficientFundsFault"
use="literal" />
+ </wsdl:fault>
+ <!-- @end added fault -->
</wsdl:operation>
<wsdl:operation name="deposit">
Added:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl?rev=569179&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
(added)
+++
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
Thu Aug 23 15:57:54 2007
@@ -0,0 +1,167 @@
+<?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://scatesttool.stockexceptiontestservice";
+ xmlns:impl="http://scatesttool.stockexceptiontestservice";
+ xmlns:tns="http://scatesttool.stockexceptiontestservice";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ name="StockExceptionTest">
+ <wsdl:types>
+ <schema
+
targetNamespace="http://scatesttool.stockexceptiontestservice";
+ xmlns="http://www.w3.org/2001/XMLSchema";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+
+ <complexType name="StockOffer">
+ <sequence>
+ <element name="symbol" minOccurs="1"
+ type="xsd:string" />
+ <element name="price" minOccurs="1"
type="xsd:float"
+ nillable="true" /><!-- max
price reqested, actual response -->
+ <element name="name" minOccurs="0"
+ type="xsd:string" />
+ </sequence>
+ </complexType>
+
+ <element name="stockQuoteOffer">
+ <complexType>
+ <sequence>
+ <element name="input"
minOccurs="0"
+ type="tns:StockOffer" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="stockQuoteOfferResponse">
+ <complexType>
+ <sequence>
+ <element
name="stockQuoteOfferReturn"
+ minOccurs="0"
type="tns:StockOffer" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <!-- Faults -->
+ <element name="invalidSymbolFault">
+ <complexType>
+ <sequence>
+ <element name="message"
minOccurs="1"
+ type="xsd:string" />
+ <element name="offer"
minOccurs="1"
+ type="tns:StockOffer" />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="marketClosedFault">
+ <complexType>
+ <sequence>
+ <element name="message"
minOccurs="1"
+ type="xsd:string" />
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </wsdl:types>
+
+
+ <wsdl:message name="stockQuoteOfferRequest">
+ <wsdl:part element="tns:stockQuoteOffer" name="parameters" />
+ </wsdl:message>
+
+ <wsdl:message name="stockQuoteOfferResponse">
+ <wsdl:part element="tns:stockQuoteOfferResponse"
+ name="parameters" />
+ </wsdl:message>
+
+ <wsdl:message name="invalidSymbolException">
+ <wsdl:part element="tns:invalidSymbolFault" name="fault" />
+ </wsdl:message>
+
+ <wsdl:message name="marketClosedException">
+ <wsdl:part element="tns:marketClosedFault" name="fault" />
+ </wsdl:message>
+
+
+ <wsdl:portType name="StockExceptionTest">
+ <wsdl:operation name="stockQuoteOffer">
+ <wsdl:input message="tns:stockQuoteOfferRequest"
+ name="stockQuoteOfferRequest" />
+
+ <wsdl:output message="tns:stockQuoteOfferResponse"
+ name="stockQuoteOfferResponse" />
+
+ <wsdl:fault message="tns:invalidSymbolException"
+ name="InvalidSymbolException" />
+
+ <wsdl:fault message="tns:marketClosedException"
+ name="MarketClosedException" />
+
+ </wsdl:operation>
+
+
+ </wsdl:portType>
+
+ <wsdl:binding name="StockExceptionTestServiceSoapBinding"
+ type="tns:StockExceptionTest">
+ <!-- <wsaw:UsingAddressing wsdl:required="false"
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->
+
+ <wsdlsoap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http"; />
+
+ <wsdl:operation name="stockQuoteOffer">
+ <wsdlsoap:operation soapAction="" />
+
+ <wsdl:input name="stockQuoteOfferRequest">
+ <wsdlsoap:body use="literal" />
+ </wsdl:input>
+
+ <wsdl:output name="stockQuoteOfferResponse">
+ <wsdlsoap:body use="literal" />
+ </wsdl:output>
+
+ <wsdl:fault name="InvalidSymbolException">
+ <wsdlsoap:fault name="InvalidSymbolException"
use="literal" />
+ </wsdl:fault>
+
+ <wsdl:fault name="MarketClosedException">
+ <wsdlsoap:fault name="MarketClosedException"
use="literal" />
+ </wsdl:fault>
+
+ </wsdl:operation>
+
+
+ </wsdl:binding>
+
+ <wsdl:service name="StockExceptionTestService">
+ <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding"
+ name="StockExceptionTestServiceSoapPort">
+ <wsdlsoap:address
+
location="http://localhost:8080/StockExceptionTestService/services/StockExceptionTestService";
/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
\ No newline at end of file
Propchange:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
