Author: alex.guizar(a)jboss.com Date: 2009-12-02 03:37:30 -0500 (Wed, 02 Dec 2009) New Revision: 353 Added: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket.wsdl Removed: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account-service.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm-service.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/interface/ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket-service.wsdl Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/atm/AtmService.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/purchase/PurchaseSVC.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/travel/TravelService.java trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.bpel trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/invoice.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/scheduling.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/shipping.wsdl 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_travel_agency/bpel/ticket.wsdl trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.wsdl Log: RIFTSAW-34: simplify organization of atm example, correct process endpoint addresses Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java 2009-12-02 08:37:30 UTC (rev 353) @@ -52,7 +52,7 @@ return new RiftSawTestSetup( TutorialBPELPurchaseTestCase.class, TEST_NAME, - "Tutorial_bpel_purchase.war,Tutorial_bpel_purchase_ejb.jar,Tutorial_bpel_purchase-1.jar"); + "purchase-queue-service.xml,Tutorial_bpel_purchase.war,Tutorial_bpel_purchase_ejb.jar,Tutorial_bpel_purchase-1.jar"); } protected void setUp() throws Exception { Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/atm/AtmService.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/atm/AtmService.java 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/atm/AtmService.java 2009-12-02 08:37:30 UTC (rev 353) @@ -14,7 +14,7 @@ public static final String SERVICE_NAME = "AtmService"; public static final String TARGET_NAMESPACE = "http://jbpm.org/examples/atm"; public static final String WSDL_LOCATION = - "http://127.0.0.1:8080/Quickstart_bpel_atm/frontEnd?wsdl"; + "http://127.0.0.1:8080/Tutorial_bpel_atm_frontEnd?wsdl"; public static final String FRONT_END_PORT_NAME = "FrontEndPort"; private static final URL WSDL_URL = createURL(WSDL_LOCATION); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/purchase/PurchaseSVC.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/purchase/PurchaseSVC.java 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/purchase/PurchaseSVC.java 2009-12-02 08:37:30 UTC (rev 353) @@ -19,7 +19,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/purchaseOrder?wsdl"; + "http://127.0.0.1:8080/Tutorial_bpel_purchase_purchaseOrder?wsdl"; private static final String PURCHASE_ORDER_PORT_NAME = "purchaseOrderSP"; private static final URL WSDL_URL = createURL(WSDL_LOCATION); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/travel/TravelService.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/travel/TravelService.java 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/travel/TravelService.java 2009-12-02 08:37:30 UTC (rev 353) @@ -19,7 +19,7 @@ static final String SERVICE_NAME = "TravelService"; static final String TARGET_NAMESPACE = "http://jbpm.org/examples/trip"; static final String WSDL_LOCATION = - "http://127.0.0.1:8080/Quickstart_bpel_travel_agencyWS?wsdl"; + "http://127.0.0.1:8080/Tutorial_bpel_travel_agency_travelAgent?wsdl"; private final static URL WSDL_URL = createURL(WSDL_LOCATION); Deleted: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account-service.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account-service.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account.wsdl (from rev 352, trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account-service.wsdl) =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/account.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm-service.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm-service.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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="AtmFrontEndService"> - <port name="FrontEndPort" binding="tns:FrontEndBinding"> - <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_atmFrontEnd" /> - </port> - </service> - -</definitions> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.bpel 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.bpel 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.wsdl (from rev 352, trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm-service.wsdl) =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/bpel-deploy.xml 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/bpel-deploy.xml 2009-12-02 08:37:30 UTC (rev 353) @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"> - <process name="atm:AtmFrontEnd" xmlns:atm="http://jbpm.org/examples/atm"> +<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" - xmlns:tic="http://jbpm.org/examples/ticket" /> + <service name="tic:TicketService" port="TicketIssuerPort" /> </invoke> <invoke partnerLink="account"> - <service name="acc:AccountService" port="AccountSystemPort" - xmlns:acc="http://jbpm.org/examples/account" /> + <service name="acc:AccountService" port="AccountSystemPort" /> </invoke> </process> </deploy> \ No newline at end of file Deleted: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket-service.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket-service.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket-service.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket.wsdl (from rev 352, trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket-service.wsdl) =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/ticket.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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 Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/invoice.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/invoice.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/invoice.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/scheduling.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/scheduling.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/scheduling.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/shipping.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/shipping.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/shipping.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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> 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-01 16:18:31 UTC (rev 352) +++ 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) @@ -22,7 +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/purchaseOrder?wsdl"; + "http://127.0.0.1:8080/Quickstart_bpel_purchase_invoiceCallback?wsdl"; static final String PURCHASE_ORDER_PORT_NAME = "purchaseOrderSP"; private static final URL WSDL_URL = createURL(WSDL_LOCATION); Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/ticket.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/ticket.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/ticket.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.wsdl 2009-12-01 16:18:31 UTC (rev 352) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.wsdl 2009-12-02 08:37:30 UTC (rev 353) @@ -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>