Commit bcd0b595 authored by Nicolas Dolet's avatar Nicolas Dolet
Browse files

Switch to version 1.1-SNAPSHOT.

Update examples with web services.
parent a7bfa66c
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-client</artifactId> <artifactId>calculator-client</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Client</name> <name>OW2 FraSCAti Examples: Calculator Client</name>
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId> <artifactId>calculator-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<wsdl.file>Calculator.wsdl</wsdl.file> <wsdl.file>http://localhost:8080/Calculator?wsdl</wsdl.file>
<composite.file>calc-client</composite.file> <composite.file>calc-client</composite.file>
<service.name>calc</service.name> <service.name>calc</service.name>
<method.name>add</method.name> <method.name>add</method.name>
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
<!-- --> <!-- -->
<!-- Contributor(s): --> <!-- Contributor(s): -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="calc-client" <composite name="calc-client"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
targetNamespace="http://frascati.ow2.org/calc-client"> targetNamespace="http://frascati.ow2.org/calc-client">
<service name="calc" promote="client/Calculator"/> <service name="calc" promote="client/Calculator"/>
...@@ -32,7 +34,8 @@ ...@@ -32,7 +34,8 @@
<implementation.java class="org.ow2.frascati.examples.soapcalc.lib.Client" /> <implementation.java class="org.ow2.frascati.examples.soapcalc.lib.Client" />
<reference name="calcservice"> <reference name="calcservice">
<binding.ws wsdlElement="http://localhost:8080/services#wsdl.port(CalcService/CalcServicePort)" /> <binding.ws wsdli:wsdlLocation="http://localhost:8080/Calculator?wsdl"
wsdlElement="http://localhost:8080/services#wsdl.port(CalcService/CalcServicePort)" />
</reference> </reference>
</component> </component>
......
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="CalcService" targetNamespace="http://api.soapcalc.examples.frascati.ow2.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://api.soapcalc.examples.frascati.ow2.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<wsdl:types>
<xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://api.soapcalc.examples.frascati.ow2.org/" xmlns:tns="http://api.soapcalc.examples.frascati.ow2.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:element name="mult" type="tns:mult"/>
<xsd:complexType name="mult">
<xsd:sequence>
<xsd:element name="arg0" type="xsd:int"/>
<xsd:element name="arg1" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="multResponse" type="tns:multResponse"/>
<xsd:complexType name="multResponse">
<xsd:sequence>
<xsd:element name="return" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="div" type="tns:div"/>
<xsd:complexType name="div">
<xsd:sequence>
<xsd:element name="arg0" type="xsd:int"/>
<xsd:element name="arg1" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="divResponse" type="tns:divResponse"/>
<xsd:complexType name="divResponse">
<xsd:sequence>
<xsd:element name="return" type="xsd:double"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="add" type="tns:add"/>
<xsd:complexType name="add">
<xsd:sequence>
<xsd:element name="arg0" type="xsd:int"/>
<xsd:element name="arg1" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="addResponse" type="tns:addResponse"/>
<xsd:complexType name="addResponse">
<xsd:sequence>
<xsd:element name="return" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="sub" type="tns:sub"/>
<xsd:complexType name="sub">
<xsd:sequence>
<xsd:element name="arg0" type="xsd:int"/>
<xsd:element name="arg1" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="subResponse" type="tns:subResponse"/>
<xsd:complexType name="subResponse">
<xsd:sequence>
<xsd:element name="return" type="xsd:int"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
</wsdl:types>
<wsdl:message name="add">
<wsdl:part element="tns:add" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="div">
<wsdl:part element="tns:div" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="divResponse">
<wsdl:part element="tns:divResponse" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="multResponse">
<wsdl:part element="tns:multResponse" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="subResponse">
<wsdl:part element="tns:subResponse" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="sub">
<wsdl:part element="tns:sub" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="mult">
<wsdl:part element="tns:mult" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:message name="addResponse">
<wsdl:part element="tns:addResponse" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="CalcServicePortType">
<wsdl:operation name="mult">
<wsdl:input message="tns:mult" name="mult">
</wsdl:input>
<wsdl:output message="tns:multResponse" name="multResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="div">
<wsdl:input message="tns:div" name="div">
</wsdl:input>
<wsdl:output message="tns:divResponse" name="divResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="add">
<wsdl:input message="tns:add" name="add">
</wsdl:input>
<wsdl:output message="tns:addResponse" name="addResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="sub">
<wsdl:input message="tns:sub" name="sub">
</wsdl:input>
<wsdl:output message="tns:subResponse" name="subResponse">
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="CalcServiceSoapBinding" type="tns:CalcServicePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="mult">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="mult">
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="multResponse">
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="div">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="div">
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="divResponse">
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="add">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="add">
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="addResponse">
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="sub">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="sub">
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="subResponse">
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="CalcService">
<wsdl:port binding="tns:CalcServiceSoapBinding" name="CalcServicePort">
<soap:address location="http://localhost:8080/Calculator"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId> <artifactId>calculator-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OW2 FraSCAti Examples: Calculator</name> <name>OW2 FraSCAti Examples: Calculator</name>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>ws-parent</artifactId> <artifactId>ws-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-server</artifactId> <artifactId>calculator-server</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Server</name> <name>OW2 FraSCAti Examples: Calculator Server</name>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId> <artifactId>calculator-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>dictionary</artifactId> <artifactId>dictionary</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Dictionary</name> <name>OW2 FraSCAti Examples: Dictionary</name>
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>ws-parent</artifactId> <artifactId>ws-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<wsdl.file>DictService.wsdl</wsdl.file> <wsdl.file>http://services.aonaware.com/DictService/DictService.asmx?wsdl</wsdl.file>
<composite.file>dictionary</composite.file> <composite.file>dictionary</composite.file>
<service.name>Dictionary</service.name> <service.name>Dictionary</service.name>
<method.name>definition</method.name> <method.name>definition</method.name>
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
<!-- --> <!-- -->
<!-- Contributor(s): Philippe Merle --> <!-- Contributor(s): Philippe Merle -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="dictionary" <composite name="dictionary"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
targetNamespace="http://frascati.ow2.org/dictionary"> targetNamespace="http://frascati.ow2.org/dictionary">
<service name="Dictionary" promote="client/Dictionary"/> <service name="Dictionary" promote="client/Dictionary"/>
...@@ -32,7 +34,8 @@ ...@@ -32,7 +34,8 @@
<implementation.java class="org.ow2.frascati.examples.dictionary.lib.Client" /> <implementation.java class="org.ow2.frascati.examples.dictionary.lib.Client" />
<reference name="dict"> <reference name="dict">
<binding.ws wsdlElement="http://services.aonaware.com/DictService#wsdl.port(DictService/DictServiceSoap)" /> <binding.ws wsdli:wsdlLocation="http://services.aonaware.com/DictService/DictService.asmx?wsdl"
wsdlElement="http://services.aonaware.com/DictService#wsdl.port(DictService/DictServiceSoap)" />
</reference> </reference>
</component> </component>
......
This diff is collapsed.
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-annotations</artifactId> <artifactId>helloworld-annotations</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Helloworld annotated</name> <name>OW2 FraSCAti Examples: Helloworld annotated</name>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-pojo</artifactId> <artifactId>helloworld-pojo</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Helloworld POJO</name> <name>OW2 FraSCAti Examples: Helloworld POJO</name>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>isbntest</artifactId> <artifactId>isbntest</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: ISBN test</name> <name>OW2 FraSCAti Examples: ISBN test</name>
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>ws-parent</artifactId> <artifactId>ws-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<wsdl.file>isbnservice.wsdl</wsdl.file> <wsdl.file>http://webservices.daehosting.com/services/isbnservice.wso?wsdl</wsdl.file>
<composite.file>isbntest</composite.file> <composite.file>isbntest</composite.file>
<service.name>Verifier</service.name> <service.name>Verifier</service.name>
<method.name>verify</method.name> <method.name>verify</method.name>
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
<!-- --> <!-- -->
<!-- Contributor(s): Philippe Merle --> <!-- Contributor(s): Philippe Merle -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="isbntest" <composite name="isbntest"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
targetNamespace="http://frascati.ow2.org/isbntest"> targetNamespace="http://frascati.ow2.org/isbntest">
<service name="Verifier" promote="client/Verifier"/> <service name="Verifier" promote="client/Verifier"/>
...@@ -32,7 +34,8 @@ ...@@ -32,7 +34,8 @@
<implementation.java class="org.ow2.frascati.examples.isbntest.lib.Client" /> <implementation.java class="org.ow2.frascati.examples.isbntest.lib.Client" />
<reference name="isbn"> <reference name="isbn">
<binding.ws wsdlElement="http://webservices.daehosting.com/services#wsdl.port(ISBNService/ISBNServiceSoap)" /> <binding.ws wsdli:wsdlLocation="http://webservices.daehosting.com/services/isbnservice.wso?wsdl"
wsdlElement="http://webservices.daehosting.com/services#wsdl.port(ISBNService/ISBNServiceSoap)" />
</reference> </reference>
</component> </component>
......
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://webservices.daehosting.com/ISBN" name="ISBNService" targetNamespace="http://webservices.daehosting.com/ISBN">
<types>
<xs:schema elementFormDefault="qualified" targetNamespace="http://webservices.daehosting.com/ISBN">
<xs:element name="IsValidISBN13">
<xs:complexType>
<xs:sequence>
<xs:element name="sISBN" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="IsValidISBN13Response">
<xs:complexType>
<xs:sequence>
<xs:element name="IsValidISBN13Result" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="IsValidISBN10">
<xs:complexType>
<xs:sequence>
<xs:element name="sISBN" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="IsValidISBN10Response">
<xs:complexType>
<xs:sequence>
<xs:element name="IsValidISBN10Result" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
</types>
<message name="IsValidISBN13SoapRequest">
<part name="parameters" element="tns:IsValidISBN13"/>
</message>
<message name="IsValidISBN13SoapResponse">
<part name="parameters" element="tns:IsValidISBN13Response"/>
</message>
<message name="IsValidISBN10SoapRequest">
<part name="parameters" element="tns:IsValidISBN10"/>
</message>
<message name="IsValidISBN10SoapResponse">
<part name="parameters" element="tns:IsValidISBN10Response"/>
</message>
<portType name="ISBNServiceSoapType">
<operation name="IsValidISBN13">
<documentation>The test is done by calculation on the first 12 digits and compare the result with the checksum number at the end. You have to pass a 13 digits number.</documentation>
<input message="tns:IsValidISBN13SoapRequest"/>
<output message="tns:IsValidISBN13SoapResponse"/>
</operation>
<operation name="IsValidISBN10">
<documentation>The test is done by calculation on the first 9 digits and compare the result with the checksum number at the end. You have to pass a 10 digits number or 8 digits and an X.</documentation>
<input message="tns:IsValidISBN10SoapRequest"/>
<output message="tns:IsValidISBN10SoapResponse"/>
</operation>
</portType>
<binding name="ISBNServiceSoapBinding" type="tns:ISBNServiceSoapType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="IsValidISBN13">
<soap:operation soapAction="" style="document"/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
</operation>
<operation name="IsValidISBN10">
<soap:operation soapAction="" style="document"/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
</operation>
</binding>
<service name="ISBNService">
<documentation>Visual DataFlex Web Service to validate ISBN numbers.</documentation>
<port name="ISBNServiceSoap" binding="tns:ISBNServiceSoapBinding">
<soap:address location="http://webservices.daehosting.com/services/isbnservice.wso"/>
</port>
</service>
</definitions>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OW2 FraSCAti examples</name> <name>OW2 FraSCAti examples</name>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>verifymail</artifactId> <artifactId>verifymail</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Verify Mail</name> <name>OW2 FraSCAti Examples: Verify Mail</name>
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
<parent> <parent>
<groupId>org.ow2.frascati.examples</groupId> <groupId>org.ow2.frascati.examples</groupId>
<artifactId>ws-parent</artifactId> <artifactId>ws-parent</artifactId>
<version>1.0</version> <version>1.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<wsdl.file>XWebEmailValidation.wsdl</wsdl.file> <wsdl.file>http://ws.xwebservices.com/XWebEmailValidation/V2/XWebEmailValidation.wsdl</wsdl.file>
<composite.file>verifymail</composite.file> <composite.file>verifymail</composite.file>
<service.name>Verifier</service.name> <service.name>Verifier</service.name>
<method.name>verify</method.name> <method.name>verify</method.name>
......