Author: lresende
Date: Thu Aug 23 17:16:03 2007
New Revision: 569195
URL: http://svn.apache.org/viewvc?rev=569195&view=rev
Log:
Merging AccountService.wsdl and AccountServiceWithFault.wsdl into
AccountService.wsdl
Removed:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
Modified:
incubator/tuscany/java/sca/itest/wsdl2java/pom.xml
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountService.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=569195&r1=569194&r2=569195&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/wsdl2java/pom.xml Thu Aug 23 17:16:03 2007
@@ -89,6 +89,26 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/sdo-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
@@ -98,7 +118,7 @@
<phase>generate-sources</phase>
<configuration>
<schemaFile>${basedir}/src/test/resources/AccountService.wsdl</schemaFile>
-
<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
+
<targetDirectory>${basedir}/target/sdo-source</targetDirectory>
<javaPackage>com.bigbank.account</javaPackage>
<prefix>Account</prefix>
<noNotification>true</noNotification>
@@ -114,7 +134,7 @@
<phase>generate-sources</phase>
<configuration>
<schemaFile>${basedir}/src/test/resources/StockExceptionTest.wsdl</schemaFile>
-
<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>
+
<targetDirectory>${basedir}/target/sdo-source</targetDirectory>
<prefix>Stock</prefix>
<noInterfaces>true</noInterfaces>
<noNotification>true</noNotification>
@@ -138,9 +158,6 @@
<wsdlFiles>
<wsdlFile>
<fileName>${basedir}/src/test/resources/AccountService.wsdl</fileName>
- </wsdlFile>
- <wsdlFile>
-
<fileName>${basedir}/src/test/resources/AccountServiceWithFault.wsdl</fileName>
</wsdlFile>
<wsdlFile>
<fileName>${basedir}/src/test/resources/StockExceptionTest.wsdl</fileName>
Modified:
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountService.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountService.wsdl?rev=569195&r1=569194&r2=569195&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountService.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/wsdl2java/src/test/resources/AccountService.wsdl
Thu Aug 23 17:16:03 2007
@@ -1,53 +1,38 @@
<?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/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/account";
targetNamespace="http://www.bigbank.com/account";
- name="AccountService">
+ name="AccountServiceWithFault">
<wsdl:types>
<xsd:schema targetNamespace="http://www.bigbank.com/account";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:account="http://www.bigbank.com/account";
-
- > <!-- xmlns:sdojava="commonj.sdo/java"
sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
-
-
-<!-- <xsd:complexType name="DataGraphRoot">
- <xsd:sequence>
- <xsd:element name="customerProfileData"
type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockSummaries" type="account:StockSummary"
maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountSummaries" type="account:AccountSummary"
maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockLogEntries" type="account:StockLogEntry"
maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountLogEntries"
type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>-->
-
+ 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>
@@ -66,7 +51,6 @@
type="account:AccountSummary"
maxOccurs="unbounded" />
<xsd:element name="stockSummaries"
type="account:StockSummary"
maxOccurs="unbounded" />
-
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AccountSummary">
@@ -76,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"
/>
@@ -87,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 -->
@@ -136,6 +120,15 @@
</xsd:sequence>
</xsd:complexType>
</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>
@@ -158,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>
@@ -189,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>
@@ -203,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>
@@ -229,7 +222,7 @@
type="account:AccountLogEntry"
maxOccurs="unbounded" />
<xsd:element name="stockLogEntries"
type="account:StockLogEntry"
maxOccurs="unbounded" />
-
+
</xsd:sequence>
</xsd:complexType>
@@ -279,6 +272,13 @@
name="withdrawResponse" />
</wsdl:message>
+ <!-- @start added fault -->
+ <wsdl:message name="insufficientFundsException">
+ <wsdl:part element="account:insufficientFundsFault"
+ name="insufficientFundsFault" />
+ </wsdl:message>
+ <!-- @end added fault -->
+
<wsdl:message name="depositRequest">
<wsdl:part element="account:deposit" name="depositRequest" />
</wsdl:message>
@@ -301,26 +301,28 @@
<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" />
</wsdl:message>
- <wsdl:portType name="AccountService">
+ <wsdl:portType name="AccountServiceWithFault">
<wsdl:operation name="getAccountReport">
<wsdl:input message="account:getAccountReportRequest" />
<wsdl:output message="account:getAccountReportResponse"
/>
@@ -334,6 +336,10 @@
<wsdl:operation name="withdraw">
<wsdl:input message="account:withdrawRequest" />
<wsdl:output message="account:withdrawResponse" />
+ <!-- @start added fault -->
+ <wsdl:fault message="account:insufficientFundsException"
+ name="insufficientFundsException" />
+ <!-- @end added fault -->
</wsdl:operation>
<wsdl:operation name="deposit">
@@ -366,7 +372,8 @@
- <wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
+ <wsdl:binding name="AccountServiceWithFaultSOAP"
+ type="account:AccountServiceWithFault">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"; />
<wsdl:operation name="getAccountReport">
@@ -399,6 +406,11 @@
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
+ <!-- @start added fault -->
+ <wsdl:fault name="insufficientFundsException">
+ <soap:fault name="insufficientFundsException"
use="literal" />
+ </wsdl:fault>
+ <!-- @end added fault -->
</wsdl:operation>
<wsdl:operation name="deposit">
@@ -457,11 +469,11 @@
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="AccountService">
- <wsdl:port binding="account:AccountServiceSOAP"
+ <wsdl:service name="AccountServiceWithFault">
+ <wsdl:port binding="account:AccountServiceWithFaultSOAP"
name="AccountServiceSOAP">
<soap:address
-
location="http://localhost:8085/services/AccountService"; />
+
location="http://localhost:8080/sample-bigbank-account/services/AccountServiceWithFault";
/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
