Author: alex.guizar(a)jboss.com Date: 2009-12-02 04:21:16 -0500 (Wed, 02 Dec 2009) New Revision: 354 Added: trunk/samples/tutorial/atm/bpel/account.wsdl trunk/samples/tutorial/atm/bpel/atm.wsdl trunk/samples/tutorial/atm/bpel/ticket.wsdl Removed: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java trunk/samples/tutorial/atm/bpel/account-service.wsdl trunk/samples/tutorial/atm/bpel/atm-service.wsdl trunk/samples/tutorial/atm/bpel/interface/ trunk/samples/tutorial/atm/bpel/ticket-service.wsdl trunk/samples/tutorial/purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java trunk/samples/tutorial/atm/bpel/atm.bpel trunk/samples/tutorial/atm/bpel/bpel-deploy.xml trunk/samples/tutorial/atm/war/ trunk/samples/tutorial/purchase/bpel/invoice.wsdl trunk/samples/tutorial/purchase/bpel/purchase.wsdl trunk/samples/tutorial/purchase/bpel/scheduling.wsdl trunk/samples/tutorial/purchase/bpel/shipping.wsdl trunk/samples/tutorial/purchase/ejb/ trunk/samples/tutorial/purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java trunk/samples/tutorial/purchase/war/ trunk/samples/tutorial/travel_agency/bpel/ticket.wsdl trunk/samples/tutorial/travel_agency/bpel/trip.wsdl trunk/samples/tutorial/travel_agency/war/ Log: RIFTSAW-34: simplify organization of atm example in distro, correct endpoint address of purchase service, ignore eclipse project files Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java 2009-12-02 09:21:16 UTC (rev 354) @@ -22,8 +22,7 @@ static final String TARGET_NAMESPACE = "http://manufacturing.org/wsdl/purchase"; static final String WSDL_LOCATION = - "http://127.0.0.1:8080/Quickstart_bpel_purchase_invoiceCallback?wsdl"; - static final String PURCHASE_ORDER_PORT_NAME = "purchaseOrderSP"; + "http://127.0.0.1:8080/Tutorial_bpel_purchase_invoiceCallback?wsdl"; private static final URL WSDL_URL = createURL(WSDL_LOCATION); @@ -45,27 +44,6 @@ } /** - * @return returns PurchaseOrderPT - */ - @WebEndpoint(name = PURCHASE_ORDER_PORT_NAME) - public PurchaseOrderPT getPurchaseOrderSP() { - return super.getPort(new QName(TARGET_NAMESPACE, PURCHASE_ORDER_PORT_NAME), - PurchaseOrderPT.class); - } - - /** - * @param features A list of {@link javax.xml.ws.WebServiceFeature} to - * configure on the proxy. Supported features not in the <code>features</code> - * parameter will have their default values. - * @return returns PurchaseOrderPT - */ - @WebEndpoint(name = PURCHASE_ORDER_PORT_NAME) - public PurchaseOrderPT getPurchaseOrderSP(WebServiceFeature... features) { - return super.getPort(new QName(TARGET_NAMESPACE, PURCHASE_ORDER_PORT_NAME), - PurchaseOrderPT.class, features); - } - - /** * @return returns InvoiceCallbackPT */ @WebEndpoint(name = INVOICE_CALLBACK_PORT_NAME) Deleted: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java 2009-12-02 09:21:16 UTC (rev 354) @@ -1,85 +0,0 @@ -package org.jboss.soa.bpel.samples.quickstart.purchase; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the - * org.jboss.soa.bpel.samples.quickstart.purchase package. - * <p> - * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ProblemInfo_QNAME = - new QName("http://manufacturing.org/xsd/purchase";, "problemInfo"); - - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.jboss.soa.bpel.samples.quickstart.purchase - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link PurchaseOrder } - */ - public PurchaseOrder createPurchaseOrder() { - return new PurchaseOrder(); - } - - /** - * Create an instance of {@link ShippingInfo } - */ - public ShippingInfo createShippingInfo() { - return new ShippingInfo(); - } - - /** - * Create an instance of {@link ProblemInfo } - */ - public ProblemInfo createProblemInfo() { - return new ProblemInfo(); - } - - /** - * Create an instance of {@link Invoice } - */ - public Invoice createInvoice() { - return new Invoice(); - } - - /** - * Create an instance of {@link CustomerInfo } - */ - public CustomerInfo createCustomerInfo() { - return new CustomerInfo(); - } - - /** - * Create an instance of {@link ScheduleInfo } - */ - public ScheduleInfo createScheduleInfo() { - return new ScheduleInfo(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ProblemInfo } - * {@code >} - */ - @XmlElementDecl(namespace = "http://manufacturing.org/xsd/purchase", name = "problemInfo") - public JAXBElement<ProblemInfo> createProblemInfo(ProblemInfo value) { - return new JAXBElement<ProblemInfo>(_ProblemInfo_QNAME, ProblemInfo.class, - null, value); - } - -} Deleted: trunk/samples/tutorial/atm/bpel/account-service.wsdl =================================================================== --- trunk/samples/tutorial/atm/bpel/account-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/atm/bpel/account-service.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions targetNamespace="http://jbpm.org/examples/account" - xmlns:tns="http://jbpm.org/examples/account" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <import namespace="http://jbpm.org/examples/account" location="interface/account.wsdl" /> - - <binding name="AccountSystemBinding" type="tns:AccountSystem"> - - <soap:binding style="rpc" - transport="http://schemas.xmlsoap.org/soap/http" /> - - <operation name="checkAccess"> - <soap:operation soapAction="http://jbpm.org/examples/account#verifyAccess" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </output> - </operation> - - <operation name="queryBalance"> - <soap:operation soapAction="http://jbpm.org/examples/account#queryBalance" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </output> - </operation> - - <operation name="updateBalance"> - <soap:operation soapAction="http://jbpm.org/examples/account#updateBalance" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> - </output> - </operation> - - </binding> - - <service name="AccountService"> - - <port name="AccountSystemPort" binding="tns:AccountSystemBinding"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_atm/accountSystem" /> - </port> - - </service> - -</definitions> \ No newline at end of file Copied: trunk/samples/tutorial/atm/bpel/account.wsdl (from rev 353, trunk/samples/tutorial/atm/bpel/account-service.wsdl) =================================================================== --- trunk/samples/tutorial/atm/bpel/account.wsdl (rev 0) +++ trunk/samples/tutorial/atm/bpel/account.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions targetNamespace="http://jbpm.org/examples/account" + xmlns:tns="http://jbpm.org/examples/account" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> + + <types> + <schema targetNamespace="http://jbpm.org/examples/account" + xmlns="http://www.w3.org/2001/XMLSchema"> + <complexType name="AccountOperation"> + <annotation> + <documentation>account data transfer type</documentation> + </annotation> + + <sequence> + <element name="customerName" type="xsd:string" /> + <element name="amount" type="xsd:double" /> + </sequence> + </complexType> + </schema> + </types> + + <message name="customerMessage"> + <documentation>customer name wrapper</documentation> + <part name="customerName" type="xsd:string" /> + </message> + + <message name="accessMessage"> + <documentation>access check response</documentation> + <part name="granted" type="xsd:boolean" /> + </message> + + <message name="balanceMessage"> + <documentation>account balance wrapper</documentation> + <part name="balance" type="xsd:double" /> + </message> + + <message name="accountOperation"> + <documentation>account operation request</documentation> + <part name="body" type="tns:AccountOperation" /> + </message> + + <portType name="AccountSystem"> + <documentation>published account functions</documentation> + + <operation name="checkAccess"> + <documentation> + tell whether a customer has an active account + </documentation> + <input message="tns:customerMessage" /> + <output message="tns:accessMessage" /> + </operation> + + <operation name="queryBalance"> + <documentation>retrieve the balance of an account</documentation> + <input message="tns:customerMessage" /> + <output message="tns:balanceMessage" /> + </operation> + + <operation name="updateBalance"> + <documentation> + increase/decrease the balance of an account + </documentation> + <input message="tns:accountOperation" /> + <output message="tns:balanceMessage" /> + </operation> + </portType> + + <binding name="AccountSystemBinding" type="tns:AccountSystem"> + <soap:binding style="rpc" + transport="http://schemas.xmlsoap.org/soap/http" /> + + <operation name="checkAccess"> + <soap:operation soapAction="http://jbpm.org/examples/account#verifyAccess" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </output> + </operation> + + <operation name="queryBalance"> + <soap:operation soapAction="http://jbpm.org/examples/account#queryBalance" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </output> + </operation> + + <operation name="updateBalance"> + <soap:operation soapAction="http://jbpm.org/examples/account#updateBalance" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/account" /> + </output> + </operation> + </binding> + + <service name="AccountService"> + <port name="AccountSystemPort" binding="tns:AccountSystemBinding"> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_atm/accountSystem" /> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: trunk/samples/tutorial/atm/bpel/atm-service.wsdl =================================================================== --- trunk/samples/tutorial/atm/bpel/atm-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/atm/bpel/atm-service.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions targetNamespace="http://jbpm.org/examples/atm" - xmlns:tns="http://jbpm.org/examples/atm" xmlns:acc="http://jbpm.org/examples/account" - xmlns:tic="http://jbpm.org/examples/ticket" xmlns:plt="http://docs.oasis-open.org/wsbpel/2.0/plnktype" - xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <import namespace="http://jbpm.org/examples/atm" location="interface/atm.wsdl" /> - <import namespace="http://jbpm.org/examples/account" location="interface/account.wsdl" /> - <import namespace="http://jbpm.org/examples/ticket" location="interface/ticket.wsdl" /> - - <vprop:property name="customerId" type="xsd:string"> - <vprop:documentation>customer name property</vprop:documentation> - </vprop:property> - - <vprop:propertyAlias propertyName="tns:customerId" - messageType="tns:logOnRequest" part="customerName" /> - - <vprop:propertyAlias propertyName="tns:customerId" - messageType="tns:balanceChange" part="customerName" /> - <vprop:propertyAlias propertyName="tns:customerId" - messageType="acc:customerMessage" part="customerName" /> - <vprop:propertyAlias propertyName="tns:customerId" - messageType="acc:accountOperation" part="body"> - <vprop:query>/body/customerName</vprop:query> - </vprop:propertyAlias> - - <vprop:property name="ticketId" type="xsd:int"> - <vprop:documentation>ticket number property</vprop:documentation> - </vprop:property> - - <vprop:propertyAlias propertyName="tns:ticketId" - messageType="tic:ticketMessage" part="ticketNo" /> - <vprop:propertyAlias propertyName="tns:ticketId" - messageType="tns:logOnRequest" part="ticketNo" /> - - <plt:partnerLinkType name="Atm-Front"> - <plt:documentation> - relationship between the ATM and the process - </plt:documentation> - <plt:role name="FrontEnd" portType="tns:FrontEnd" /> - </plt:partnerLinkType> - <plt:partnerLinkType name="Front-Ticket"> - <vprop:documentation> - relationship between the process and the ticket issuer - </vprop:documentation> - <plt:role name="TicketIssuer" portType="tic:TicketIssuer" /> - </plt:partnerLinkType> - <plt:partnerLinkType name="Front-Account"> - <plt:documentation> - relationship between the process and the account system - </plt:documentation> - <plt:role name="AccountSystem" portType="acc:AccountSystem" /> - </plt:partnerLinkType> - - <binding name="FrontEndBinding" type="tns:FrontEnd"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" /> - <operation name="connect"> - <soap:operation soapAction="http://jbpm.org/examples/atm/connect" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - </operation> - <operation name="disconnect"> - <soap:operation soapAction="http://jbpm.org/examples/atm/disconnect" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - </operation> - <operation name="status"> - <soap:operation soapAction="http://jbpm.org/examples/atm/status" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - </operation> - <operation name="logOn"> - <soap:operation soapAction="http://jbpm.org/examples/atm/logOn" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - <fault name="unauthorizedAccess"> - <soap:fault use="literal" name="unauthorizedAccess" /> - </fault> - </operation> - <operation name="logOff"> - <soap:operation soapAction="http://jbpm.org/examples/atm/logOff" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - </operation> - <operation name="getBalance"> - <soap:operation soapAction="http://jbpm.org/examples/atm/getBalance" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - </operation> - <operation name="deposit"> - <soap:operation soapAction="http://jbpm.org/examples/atm/deposit" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - </operation> - <operation name="withdraw"> - <soap:operation soapAction="http://jbpm.org/examples/atm/withdraw" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> - </output> - <fault name="insufficientFunds"> - <soap:fault use="literal" name="insufficientFunds" /> - </fault> - </operation> - </binding> - - <service name="AtmService"> - <port name="FrontEndPort" binding="tns:FrontEndBinding"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_atm/frontEnd" /> - </port> - </service> - -</definitions> Modified: trunk/samples/tutorial/atm/bpel/atm.bpel =================================================================== --- trunk/samples/tutorial/atm/bpel/atm.bpel 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/atm/bpel/atm.bpel 2009-12-02 09:21:16 UTC (rev 354) @@ -5,11 +5,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... - <bpel:import namespace="http://jbpm.org/examples/account" location="account-service.wsdl" + <bpel:import namespace="http://jbpm.org/examples/account" location="account.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" /> - <bpel:import namespace="http://jbpm.org/examples/ticket" location="ticket-service.wsdl" + <bpel:import namespace="http://jbpm.org/examples/ticket" location="ticket.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" /> - <bpel:import namespace="http://jbpm.org/examples/atm" location="atm-service.wsdl" + <bpel:import namespace="http://jbpm.org/examples/atm" location="atm.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" /> <partnerLinks> Copied: trunk/samples/tutorial/atm/bpel/atm.wsdl (from rev 353, trunk/samples/tutorial/atm/bpel/atm-service.wsdl) =================================================================== --- trunk/samples/tutorial/atm/bpel/atm.wsdl (rev 0) +++ trunk/samples/tutorial/atm/bpel/atm.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions targetNamespace="http://jbpm.org/examples/atm" + xmlns:tns="http://jbpm.org/examples/atm" xmlns:acc="http://jbpm.org/examples/account" + xmlns:tic="http://jbpm.org/examples/ticket" xmlns:plt="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> + + <import namespace="http://jbpm.org/examples/ticket" location="ticket.wsdl" /> + <import namespace="http://jbpm.org/examples/account" location="account.wsdl" /> + + <types> + <schema targetNamespace="http://jbpm.org/examples/atm" xmlns="http://www.w3.org/2001/XMLSchema"> + <complexType name="UnauthorizedAccess"> + <sequence> + <element name="customerName" type="xsd:string" /> + </sequence> + </complexType> + + <element name="unauthorizedAccess" type="tns:UnauthorizedAccess" /> + + <complexType name="InsufficientFunds"> + <sequence> + <element name="customerName" type="xsd:string" /> + <element name="amount" type="xsd:double" /> + </sequence> + </complexType> + + <element name="insufficientFunds" type="tns:InsufficientFunds" /> + </schema> + </types> + + <message name="connectRequest" /> + + <message name="logOnRequest"> + <part name="ticketNo" type="xsd:int" /> + <part name="customerName" type="xsd:string" /> + </message> + + <message name="logOnResponse" /> + + <message name="statusResponse"> + <part name="status" type="xsd:string" /> + </message> + + <message name="balanceChange"> + <part name="customerName" type="xsd:string" /> + <part name="amount" type="xsd:double" /> + </message> + + <message name="unauthorizedAccess"> + <part name="detail" element="tns:unauthorizedAccess" /> + </message> + + <message name="insufficientFunds"> + <part name="detail" element="tns:insufficientFunds" /> + </message> + + <portType name="FrontEnd"> + <documentation>bank functions available to ATMs</documentation> + + <operation name="connect"> + <documentation>initiate bank connection</documentation> + <input message="tns:connectRequest" /> + <output message="tic:ticketMessage" /> + </operation> + + <operation name="disconnect"> + <documentation>terminate bank connection</documentation> + <input message="tic:ticketMessage" /> + </operation> + + <operation name="status"> + <documentation>retrieve bank connection status</documentation> + <input message="tic:ticketMessage" /> + <output message="tns:statusResponse" /> + </operation> + + <operation name="logOn"> + <documentation>initiate customer access</documentation> + <input message="tns:logOnRequest" /> + <output message="tns:logOnResponse" /> + <fault name="unauthorizedAccess" message="tns:unauthorizedAccess" /> + </operation> + + <operation name="logOff"> + <documentation>terminate customer access</documentation> + <input message="acc:customerMessage" /> + </operation> + + <operation name="getBalance"> + <documentation>retrieve account balance</documentation> + <input message="acc:customerMessage" /> + <output message="acc:balanceMessage" /> + </operation> + + <operation name="deposit"> + <documentation>increase account balance</documentation> + <input message="tns:balanceChange" /> + <output message="acc:balanceMessage" /> + </operation> + + <operation name="withdraw"> + <documentation>decrease account balance</documentation> + <input message="tns:balanceChange" /> + <output message="acc:balanceMessage" /> + <fault name="insufficientFunds" message="tns:insufficientFunds" /> + </operation> + </portType> + + <binding name="FrontEndBinding" type="tns:FrontEnd"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" /> + + <operation name="connect"> + <soap:operation soapAction="http://jbpm.org/examples/atm/connect" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + </operation> + + <operation name="disconnect"> + <soap:operation soapAction="http://jbpm.org/examples/atm/disconnect" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + </operation> + + <operation name="status"> + <soap:operation soapAction="http://jbpm.org/examples/atm/status" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + </operation> + + <operation name="logOn"> + <soap:operation soapAction="http://jbpm.org/examples/atm/logOn" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + <fault name="unauthorizedAccess"> + <soap:fault use="literal" name="unauthorizedAccess" /> + </fault> + </operation> + + <operation name="logOff"> + <soap:operation soapAction="http://jbpm.org/examples/atm/logOff" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + </operation> + + <operation name="getBalance"> + <soap:operation soapAction="http://jbpm.org/examples/atm/getBalance" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + </operation> + + <operation name="deposit"> + <soap:operation soapAction="http://jbpm.org/examples/atm/deposit" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + </operation> + + <operation name="withdraw"> + <soap:operation soapAction="http://jbpm.org/examples/atm/withdraw" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/atm" /> + </output> + <fault name="insufficientFunds"> + <soap:fault use="literal" name="insufficientFunds" /> + </fault> + </operation> + </binding> + + <service name="AtmService"> + <port name="FrontEndPort" binding="tns:FrontEndBinding"> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_atm_frontEnd" /> + </port> + </service> + + <vprop:property name="customerId" type="xsd:string"> + <vprop:documentation>customer name property</vprop:documentation> + </vprop:property> + + <vprop:propertyAlias propertyName="tns:customerId" + messageType="tns:logOnRequest" part="customerName" /> + + <vprop:propertyAlias propertyName="tns:customerId" + messageType="tns:balanceChange" part="customerName" /> + <vprop:propertyAlias propertyName="tns:customerId" + messageType="acc:customerMessage" part="customerName" /> + <vprop:propertyAlias propertyName="tns:customerId" + messageType="acc:accountOperation" part="body"> + <vprop:query>/body/customerName</vprop:query> + </vprop:propertyAlias> + + <vprop:property name="ticketId" type="xsd:int"> + <vprop:documentation>ticket number property</vprop:documentation> + </vprop:property> + + <vprop:propertyAlias propertyName="tns:ticketId" + messageType="tic:ticketMessage" part="ticketNo" /> + <vprop:propertyAlias propertyName="tns:ticketId" + messageType="tns:logOnRequest" part="ticketNo" /> + + <plt:partnerLinkType name="Atm-Front"> + <plt:documentation> + relationship between the ATM and the process + </plt:documentation> + <plt:role name="FrontEnd" portType="tns:FrontEnd" /> + </plt:partnerLinkType> + + <plt:partnerLinkType name="Front-Ticket"> + <vprop:documentation> + relationship between the process and the ticket issuer + </vprop:documentation> + <plt:role name="TicketIssuer" portType="tic:TicketIssuer" /> + </plt:partnerLinkType> + + <plt:partnerLinkType name="Front-Account"> + <plt:documentation> + relationship between the process and the account system + </plt:documentation> + <plt:role name="AccountSystem" portType="acc:AccountSystem" /> + </plt:partnerLinkType> + +</definitions> Modified: trunk/samples/tutorial/atm/bpel/bpel-deploy.xml =================================================================== --- trunk/samples/tutorial/atm/bpel/bpel-deploy.xml 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/atm/bpel/bpel-deploy.xml 2009-12-02 09:21:16 UTC (rev 354) @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:atm="http://jbpm.org/examples/atm" - xmlns:tic="http://jbpm.org/examples/ticket" xmlns:acc="http://jbpm.org/examples/account"> +<deploy xmlns:atm="http://jbpm.org/examples/atm" xmlns:tic="http://jbpm.org/examples/ticket" + xmlns:acc="http://jbpm.org/examples/account" xmlns="http://www.apache.org/ode/schemas/dd/2007/03"> <process name="atm:AtmFrontEnd"> <active>true</active> - <provide partnerLink="atm"> - <service name="atm:AtmFrontEndService" port="FrontEndPort" /> + <service name="atm:AtmService" port="FrontEndPort" /> </provide> - <invoke partnerLink="ticket"> <service name="tic:TicketService" port="TicketIssuerPort" /> </invoke> - <invoke partnerLink="account"> <service name="acc:AccountService" port="AccountSystemPort" /> </invoke> Deleted: trunk/samples/tutorial/atm/bpel/ticket-service.wsdl =================================================================== --- trunk/samples/tutorial/atm/bpel/ticket-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/atm/bpel/ticket-service.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions targetNamespace="http://jbpm.org/examples/ticket" - xmlns:tns="http://jbpm.org/examples/ticket" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <import namespace="http://jbpm.org/examples/ticket" location="interface/ticket.wsdl" /> - - <binding name="TicketIssuerBinding" type="tns:TicketIssuer"> - - <soap:binding style="rpc" - transport="http://schemas.xmlsoap.org/soap/http" /> - - <operation name="createTicket"> - <soap:operation soapAction="http://jbpm.org/examples/ticket#createTicket" /> - <input> - <soap:body use="literal" namespace="http://jbpm.org/examples/ticket" /> - </input> - <output> - <soap:body use="literal" namespace="http://jbpm.org/examples/ticket" /> - </output> - </operation> - - </binding> - - <service name="TicketService"> - <port name="TicketIssuerPort" binding="tns:TicketIssuerBinding"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_atm/ticketIssuer" /> - </port> - </service> - -</definitions> \ No newline at end of file Copied: trunk/samples/tutorial/atm/bpel/ticket.wsdl (from rev 353, trunk/samples/tutorial/atm/bpel/ticket-service.wsdl) =================================================================== --- trunk/samples/tutorial/atm/bpel/ticket.wsdl (rev 0) +++ trunk/samples/tutorial/atm/bpel/ticket.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions targetNamespace="http://jbpm.org/examples/ticket" + xmlns:tns="http://jbpm.org/examples/ticket" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> + + <message name="ticketRequest"> + <documentation>ticket creation request</documentation> + </message> + + <message name="ticketMessage"> + <documentation>ticket number wrapper</documentation> + <part name="ticketNo" type="xsd:int" /> + </message> + + <portType name="TicketIssuer"> + <documentation>interface to ticket issuer service</documentation> + + <operation name="createTicket"> + <documentation> + generate a ticket number, distinct from previous calls + </documentation> + <input message="tns:ticketRequest" /> + <output message="tns:ticketMessage" /> + </operation> + + </portType> + + <binding name="TicketIssuerBinding" type="tns:TicketIssuer"> + + <soap:binding style="rpc" + transport="http://schemas.xmlsoap.org/soap/http" /> + + <operation name="createTicket"> + <soap:operation soapAction="http://jbpm.org/examples/ticket#createTicket" /> + <input> + <soap:body use="literal" namespace="http://jbpm.org/examples/ticket" /> + </input> + <output> + <soap:body use="literal" namespace="http://jbpm.org/examples/ticket" /> + </output> + </operation> + + </binding> + + <service name="TicketService"> + <port name="TicketIssuerPort" binding="tns:TicketIssuerBinding"> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_atm/ticketIssuer" /> + </port> + </service> + +</definitions> \ No newline at end of file Property changes on: trunk/samples/tutorial/atm/war ___________________________________________________________________ Name: svn:ignore + .settings .classpath .project target Modified: trunk/samples/tutorial/purchase/bpel/invoice.wsdl =================================================================== --- trunk/samples/tutorial/purchase/bpel/invoice.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/bpel/invoice.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -36,7 +36,7 @@ <service name="invoiceSVC"> <port name="computePriceSP" binding="tns:computePriceSB"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_purchase/invoiceService" /> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_purchase/invoiceService" /> </port> </service> Modified: trunk/samples/tutorial/purchase/bpel/purchase.wsdl =================================================================== --- trunk/samples/tutorial/purchase/bpel/purchase.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/bpel/purchase.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -146,15 +146,15 @@ <service name="purchaseSVC"> <port name="purchaseOrderSP" binding="pos:purchaseOrderSB"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_purchase/purchaseOrder" /> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_purchase_purchaseOrder" /> </port> <port name="invoiceCallbackSP" binding="pos:invoiceCallbackSB"> <soap:address - location="http://127.0.0.1:8080/Quickstart_bpel_purchase/invoiceCallback" /> + location="http://127.0.0.1:8080/Tutorial_bpel_purchase_invoiceCallback" /> </port> <port name="shippingCallbackSP" binding="pos:shippingCallbackSB"> <soap:address - location="http://127.0.0.1:8080/Quickstart_bpel_purchase/shippingCallback" /> + location="http://127.0.0.1:8080/Tutorial_bpel_purchase_shippingCallback" /> </port> </service> </definitions> \ No newline at end of file Modified: trunk/samples/tutorial/purchase/bpel/scheduling.wsdl =================================================================== --- trunk/samples/tutorial/purchase/bpel/scheduling.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/bpel/scheduling.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -36,7 +36,7 @@ <service name="schedulingSVC"> <port name="schedulingSP" binding="tns:schedulingSB"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_purchase/schedulingProcess" /> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_purchase/schedulingProcess" /> </port> </service> Modified: trunk/samples/tutorial/purchase/bpel/shipping.wsdl =================================================================== --- trunk/samples/tutorial/purchase/bpel/shipping.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/bpel/shipping.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -28,7 +28,7 @@ <service name="shippingSVC"> <port name="shippingSP" binding="tns:shippingSB"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_purchase/shippingService" /> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_purchase/shippingService" /> </port> </service> Property changes on: trunk/samples/tutorial/purchase/ejb ___________________________________________________________________ Name: svn:ignore - .project .classpath target + .project .classpath target .settings Modified: trunk/samples/tutorial/purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java =================================================================== --- trunk/samples/tutorial/purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/ejb/src/org/jboss/soa/bpel/samples/quickstart/purchase/PurchaseSVC.java 2009-12-02 09:21:16 UTC (rev 354) @@ -22,8 +22,7 @@ static final String TARGET_NAMESPACE = "http://manufacturing.org/wsdl/purchase"; static final String WSDL_LOCATION = - "http://127.0.0.1:8080/Quickstart_bpel_purchase/invoiceCallback?wsdl"; - static final String PURCHASE_ORDER_PORT_NAME = "purchaseOrderSP"; + "http://127.0.0.1:8080/Tutorial_bpel_purchase_invoiceCallback?wsdl"; private static final URL WSDL_URL = createURL(WSDL_LOCATION); Property changes on: trunk/samples/tutorial/purchase/war ___________________________________________________________________ Name: svn:ignore - .project .classpath target + .project .classpath target .settings Deleted: trunk/samples/tutorial/purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java =================================================================== --- trunk/samples/tutorial/purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/purchase/war/src/org/jboss/soa/bpel/samples/quickstart/purchase/ObjectFactory.java 2009-12-02 09:21:16 UTC (rev 354) @@ -1,85 +0,0 @@ -package org.jboss.soa.bpel.samples.quickstart.purchase; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the - * org.jboss.soa.bpel.samples.quickstart.purchase package. - * <p> - * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ProblemInfo_QNAME = - new QName("http://manufacturing.org/xsd/purchase";, "problemInfo"); - - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.jboss.soa.bpel.samples.quickstart.purchase - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link PurchaseOrder } - */ - public PurchaseOrder createPurchaseOrder() { - return new PurchaseOrder(); - } - - /** - * Create an instance of {@link ShippingInfo } - */ - public ShippingInfo createShippingInfo() { - return new ShippingInfo(); - } - - /** - * Create an instance of {@link ProblemInfo } - */ - public ProblemInfo createProblemInfo() { - return new ProblemInfo(); - } - - /** - * Create an instance of {@link Invoice } - */ - public Invoice createInvoice() { - return new Invoice(); - } - - /** - * Create an instance of {@link CustomerInfo } - */ - public CustomerInfo createCustomerInfo() { - return new CustomerInfo(); - } - - /** - * Create an instance of {@link ScheduleInfo } - */ - public ScheduleInfo createScheduleInfo() { - return new ScheduleInfo(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ProblemInfo } - * {@code >} - */ - @XmlElementDecl(namespace = "http://manufacturing.org/xsd/purchase", name = "problemInfo") - public JAXBElement<ProblemInfo> createProblemInfo(ProblemInfo value) { - return new JAXBElement<ProblemInfo>(_ProblemInfo_QNAME, ProblemInfo.class, - null, value); - } - -} Modified: trunk/samples/tutorial/travel_agency/bpel/ticket.wsdl =================================================================== --- trunk/samples/tutorial/travel_agency/bpel/ticket.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/travel_agency/bpel/ticket.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -39,7 +39,7 @@ <service name="TicketService"> <port name="TicketIssuerPort" binding="tns:TicketIssuerBinding"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_travel_agency/ticketIssuer" /> + <soap:address location="http://127.0.0.1:8080/Tutorial_bpel_travel_agency/ticketIssuer" /> </port> </service> Modified: trunk/samples/tutorial/travel_agency/bpel/trip.wsdl =================================================================== --- trunk/samples/tutorial/travel_agency/bpel/trip.wsdl 2009-12-02 08:37:30 UTC (rev 353) +++ trunk/samples/tutorial/travel_agency/bpel/trip.wsdl 2009-12-02 09:21:16 UTC (rev 354) @@ -157,7 +157,7 @@ <service name="TravelService"> <port name="TravelAgentPort" binding="tns:TravelAgentBinding"> <soap:address - location="http://127.0.0.1:8080/Quickstart_bpel_travel_agencyWS" /> + location="http://127.0.0.1:8080/Tutorial_bpel_travel_agency_travelAgent" /> </port> </service> Property changes on: trunk/samples/tutorial/travel_agency/war ___________________________________________________________________ Name: svn:ignore + .settings .classpath .project target