Author: objectiser Date: 2011-04-14 11:09:26 -0400 (Thu, 14 Apr 2011) New Revision: 1354 Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml trunk/samples/quickstart/simple_correlation_header/ trunk/samples/quickstart/simple_correlation_header/.project trunk/samples/quickstart/simple_correlation_header/.settings/ trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/samples/quickstart/simple_correlation_header/bpelContent/ trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml trunk/samples/quickstart/simple_correlation_header/build.xml trunk/samples/quickstart/simple_correlation_header/messages/ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml trunk/samples/quickstart/simple_correlation_header/readme.txt Modified: trunk/distribution/src/main/assembly/bin.xml trunk/integration-tests/build.xml trunk/pom.xml Log: RIFTSAW-372 - added integration test, and also new quickstart example, to demonstrate correlation based on header properties. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2011-04-14 06:40:08 UTC (rev 1353) +++ trunk/distribution/src/main/assembly/bin.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -110,6 +110,7 @@ <include>quickstart/secure_service/**</include> <include>quickstart/service_handler/**</include> <include>quickstart/simple_correlation/**</include> + <include>quickstart/simple_correlation_header/**</include> <include>quickstart/simple_invoke/**</include> <include>quickstart/simple_pick/**</include> <include>quickstart/while_wait/**</include> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2011-04-14 06:40:08 UTC (rev 1353) +++ trunk/integration-tests/build.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -211,6 +211,7 @@ <ant antfile="src/test/resources/testcases/RiftSaw_318/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_326/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_345/build.xml" /> + <ant antfile="src/test/resources/testcases/RiftSaw_372/build.xml" /> <ant antfile="src/test/resources/management/RiftSaw_238/build.xml" /> Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.soa.bpel.tests.testcases; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the RiftSaw_372 testcase sample. + */ +public class RiftSaw372TestCase extends RiftSawTest { + + private static final String TEST_NAME = "RiftSaw_372"; + + public RiftSaw372TestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(RiftSaw372TestCase.class, + TEST_NAME, "RiftSaw_372-1.jar")); + } + + public void testSendHelloGoodbye() throws Exception { + + // Additional delay - this is the first test, and on loaded servers + // it can sometimes fail if the BPEL process has not had time to be + // compiled + try { + synchronized(this) { + wait(30000); + } + } catch(Exception e) { + e.printStackTrace(); + } + + String result1=sendSOAPMessage("hello_request1.xml", + "http://localhost:8080/RiftSaw_372WS"); + + result1 = processResult(result1); + + assertMessageFromFile(result1, "hello_response1.xml"); + + String result2=sendSOAPMessage("goodbye_request1.xml", + "http://localhost:8080/RiftSaw_372WS"); + + result2 = processResult(result2); + + assertMessageFromFile(result2, "goodbye_response1.xml"); + } +} Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,112 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<process name="HelloGoodbye" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl" + queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" + expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"> + + <import location="HelloGoodbye.wsdl" + namespace="http://www.jboss.org/bpel/examples/wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="helloGoodbyePartnerLink" + partnerLinkType="intf:HelloGoodbyePartnerLinkType" + myRole="me" /> + </partnerLinks> + + <correlationSets xmlns:cor="http://example.com/supplyCorrelation"> + <correlationSet name="Session" + properties="intf:SessionID" /> + </correlationSets> + + <variables> + <variable name="myHelloVar" messageType="intf:HelloMessage"/> + <variable name="myGoodbyeVar" messageType="intf:GoodbyeMessage"/> + <variable name="mesgVar" type="xsd:string"/> + </variables> + + <sequence> + <receive + name="start" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="hello" + variable="myHelloVar" + createInstance="yes"> + <correlations> + <correlation set="Session" initiate="yes" /> + </correlations> + </receive> + + <assign name="assignHelloMesg"> + <copy> + <from variable="myHelloVar" part="Message"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="myHelloVar" part="Message"/> + </copy> + </assign> + <reply name="end" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="hello" + variable="myHelloVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + <receive + name="start" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="goodbye" + variable="myGoodbyeVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </receive> + + <assign name="assignGoodbyeMesg"> + <copy> + <from variable="myGoodbyeVar" part="Message"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="myGoodbyeVar" part="Message"/> + </copy> + </assign> + <reply name="end" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="goodbye" + variable="myGoodbyeVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<wsdl:definitions + targetNamespace="http://www.jboss.org/bpel/examples/wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://www.jboss.org/bpel/examples/wsdl" + xmlns:types="http://www.jboss.org/bpel/examples/xsd" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + + <wsdl:types> + <xsd:schema targetNamespace="http://www.jboss.org/bpel/examples/xsd"> + <xsd:element name="SessionIdentity" type="xsd:int" /> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="HelloMessage"> + <wsdl:part name="ID" element="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:message name="GoodbyeMessage"> + <wsdl:part name="ID" element="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="HelloGoodbyePortType"> + <wsdl:operation name="hello"> + <wsdl:input message="tns:HelloMessage" name="HelloIn"/> + <wsdl:output message="tns:HelloMessage" name="HelloOut"/> + </wsdl:operation> + <wsdl:operation name="goodbye"> + <wsdl:input message="tns:GoodbyeMessage" name="GoodbyeIn"/> + <wsdl:output message="tns:GoodbyeMessage" name="GoodbyeOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloGoodbyeSoapBinding" type="tns:HelloGoodbyePortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="hello"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:HelloMessage" + part="ID" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:HelloMessage" + part="ID" use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="goodbye"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:GoodbyeMessage" + part="ID" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:GoodbyeMessage" + part="ID" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloGoodbyeService"> + <wsdl:port name="HelloGoodbyePort" binding="tns:HelloGoodbyeSoapBinding"> + <soap:address location="http://localhost:8080/RiftSaw_372WS"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="HelloGoodbyePartnerLinkType"> + <plnk:role name="me" portType="tns:HelloGoodbyePortType"/> + <plnk:role name="you" portType="tns:HelloGoodbyePortType"/> + </plnk:partnerLinkType> + + <vprop:property name="SessionID" type="xsd:int" /> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:HelloMessage" part="ID"> + <vprop:query>text()</vprop:query> + </vprop:propertyAlias> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:GoodbyeMessage" part="ID"> + <vprop:query>text()</vprop:query> + </vprop:propertyAlias> + + +</wsdl:definitions> + Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,30 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:bpl="http://www.jboss.org/bpel/examples" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl"> + + <process name="bpl:HelloGoodbye"> + <active>true</active> + <process-events generate="all"/> + <provide partnerLink="helloGoodbyePartnerLink"> + <service name="intf:HelloGoodbyeService" port="HelloGoodbyePort"/> + </provide> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,30 @@ +<project name="RiftSaw_372" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/testcases/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" /> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:goodbye> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:ns='http://www.jboss.org/bpel/examples/xsd'>1</ns:Ses... xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><Mess... World</Message></odens:goodbyeResponse></env:Body></env:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:ns='http://www.jboss.org/bpel/examples/xsd'>1</ns:Ses... xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><Mess... World</Message></odens:helloResponse></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-14 06:40:08 UTC (rev 1353) +++ trunk/pom.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -85,7 +85,7 @@ </profiles> <properties> - <riftsaw.ode.version>2.3.0.CR1</riftsaw.ode.version> + <riftsaw.ode.version>2.3.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.3.0-SNAPSHOT</riftsaw.engine.version> <bpel.console.version>2.2.5-SNAPSHOT</bpel.console.version> <activity.monitor.model.version>1.0.0.CR1</activity.monitor.model.version> Added: trunk/samples/quickstart/simple_correlation_header/.project =================================================================== --- trunk/samples/quickstart/simple_correlation_header/.project (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/.project 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Quickstart_bpel_simple_correlation_header</name> + <comment></comment> + <projects> + <project>Quickstart_bpel_simple_correlation_header</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.bpel.validator.builder</name> + <arguments> + <dictionary> + <key>debug</key> + <value>false</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Added: trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="Quickstart_bpel_simple_correlation"> + <wb-resource deploy-path="/" source-path="/bpelContent"/> + <dependent-module deploy-path="/" handle="module:/org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolders/"> + <dependency-type>consumes</dependency-type> + </dependent-module> + </wb-module> +</project-modules> Added: trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jbt.bpel.facet.core"/> + <installed facet="jbt.bpel.facet.core" version="2.0"/> +</faceted-project> Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel =================================================================== --- trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,112 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<process name="HelloGoodbye" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl" + queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" + expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"> + + <import location="HelloGoodbye.wsdl" + namespace="http://www.jboss.org/bpel/examples/wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="helloGoodbyePartnerLink" + partnerLinkType="intf:HelloGoodbyePartnerLinkType" + myRole="me" /> + </partnerLinks> + + <correlationSets xmlns:cor="http://example.com/supplyCorrelation"> + <correlationSet name="Session" + properties="intf:SessionID" /> + </correlationSets> + + <variables> + <variable name="myHelloVar" messageType="intf:HelloMessage"/> + <variable name="myGoodbyeVar" messageType="intf:GoodbyeMessage"/> + <variable name="mesgVar" type="xsd:string"/> + </variables> + + <sequence> + <receive + name="start" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="hello" + variable="myHelloVar" + createInstance="yes"> + <correlations> + <correlation set="Session" initiate="yes" /> + </correlations> + </receive> + + <assign name="assignHelloMesg"> + <copy> + <from variable="myHelloVar" part="Message"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="myHelloVar" part="Message"/> + </copy> + </assign> + <reply name="end" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="hello" + variable="myHelloVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + <receive + name="start" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="goodbye" + variable="myGoodbyeVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </receive> + + <assign name="assignGoodbyeMesg"> + <copy> + <from variable="myGoodbyeVar" part="Message"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="myGoodbyeVar" part="Message"/> + </copy> + </assign> + <reply name="end" + partnerLink="helloGoodbyePartnerLink" + portType="intf:HelloGoodbyePortType" + operation="goodbye" + variable="myGoodbyeVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + </sequence> +</process> Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl =================================================================== --- trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<wsdl:definitions + targetNamespace="http://www.jboss.org/bpel/examples/wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://www.jboss.org/bpel/examples/wsdl" + xmlns:types="http://www.jboss.org/bpel/examples/xsd" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + + <wsdl:types> + <xsd:schema targetNamespace="http://www.jboss.org/bpel/examples/xsd"> + <xsd:element name="SessionIdentity" type="xsd:int" /> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="HelloMessage"> + <wsdl:part name="ID" element="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:message name="GoodbyeMessage"> + <wsdl:part name="ID" element="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="HelloGoodbyePortType"> + <wsdl:operation name="hello"> + <wsdl:input message="tns:HelloMessage" name="HelloIn"/> + <wsdl:output message="tns:HelloMessage" name="HelloOut"/> + </wsdl:operation> + <wsdl:operation name="goodbye"> + <wsdl:input message="tns:GoodbyeMessage" name="GoodbyeIn"/> + <wsdl:output message="tns:GoodbyeMessage" name="GoodbyeOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloGoodbyeSoapBinding" type="tns:HelloGoodbyePortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="hello"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:HelloMessage" + part="ID" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:HelloMessage" + part="ID" use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="goodbye"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:GoodbyeMessage" + part="ID" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal" parts="Message"/> + <soap:header message="tns:GoodbyeMessage" + part="ID" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloGoodbyeService"> + <wsdl:port name="HelloGoodbyePort" binding="tns:HelloGoodbyeSoapBinding"> + <soap:address location="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="HelloGoodbyePartnerLinkType"> + <plnk:role name="me" portType="tns:HelloGoodbyePortType"/> + <plnk:role name="you" portType="tns:HelloGoodbyePortType"/> + </plnk:partnerLinkType> + + <vprop:property name="SessionID" type="xsd:int" /> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:HelloMessage" part="ID"> + <vprop:query>text()</vprop:query> + </vprop:propertyAlias> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:GoodbyeMessage" part="ID"> + <vprop:query>text()</vprop:query> + </vprop:propertyAlias> + + +</wsdl:definitions> + Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,30 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:bpl="http://www.jboss.org/bpel/examples" + xmlns:intf="http://www.jboss.org/bpel/examples/wsdl"> + + <process name="bpl:HelloGoodbye"> + <active>true</active> + <process-events generate="all"/> + <provide partnerLink="helloGoodbyePartnerLink"> + <service name="intf:HelloGoodbyeService" port="HelloGoodbyePort"/> + </provide> + </process> +</deploy> Added: trunk/samples/quickstart/simple_correlation_header/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/build.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/build.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,78 @@ +<project name="Quickstart_bpel_simple_correlation_header" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> + + <property name="version" value="1" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <jar basedir="bpelContent" destfile="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="sendhello"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/hello_request1.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> + + <target name="sendgoodbye"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/goodbye_request1.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> + + <target name="sendhello2"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/hello_request2.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> + + <target name="sendgoodbye2"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/goodbye_request2.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> + + <target name="sendhello3"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/hello_request3.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> + + <target name="sendgoodbye3"> + <echo>Send test message to: ${ant.project.name}</echo> + <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> + <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/> + <arg value="messages/goodbye_request3.xml"/> + <classpath refid="rs-exec-classpath"/> + </java> + </target> +</project> Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:goodbye> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">2</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:goodbye> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">3</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:goodbye> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">2</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">3</ns:S... + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/samples/quickstart/simple_correlation_header/readme.txt =================================================================== --- trunk/samples/quickstart/simple_correlation_header/readme.txt (rev 0) +++ trunk/samples/quickstart/simple_correlation_header/readme.txt 2011-04-14 15:09:26 UTC (rev 1354) @@ -0,0 +1,33 @@ +Quickstart Examples - Simple Correlation Header +=============================================== + +This example is a variation of the 'simple_correlation' example that +builds on the previous 'hello_world' example, to show a +simple example of how two separate interactions can be correlated to the +same BPEL process instance. This variation carries the information +being correlated within the SOAP message header. + +In this case, a 'hello' message must be sent first, and then a 'goodbye' +message must follow, where both messages must have the same ID field to +enable them to be correlated to the same process instance. + +To deploy the example, open a command line window in the example's folder, +and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'. + +To test the example, for example using the SOAPUI client, an example 'hello' +and 'goodbye' message can be found in the messages sub-folder, with the +relevant WSDL being located in the bpel sub-folder. + +Alternatively, use the 'ant sendhello' command (from a command line window) +to send the initial message, and then 'ant sendgoodbye' to send the last +message correlated to the same session. + +NOTE: The "ant deploy" command will by default deploy version 1 of the +example to the server. If you wish to change the example, and redeploy, +then you will need to update the version number in the build.xml, or +override the version property, e.g. "ant -Dversion=2 deploy" (and similarly +when undeploying "ant -Dversion=2 undeploy"). + +Some handy URLs: +http://localhost:8080/bpel-console is the BPEL console +http://localhost:8080/Quickstart_bpel_simple_correlationWS?wsdl is the URL to the BPEL process' WSDL