Author: objectiser Date: 2010-01-29 09:03:01 -0500 (Fri, 29 Jan 2010) New Revision: 482 Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_response1.xml Modified: trunk/docs/docbook/userguide/src/main/module/deploy.xml trunk/integration-tests/build.xml Log: RIFTSAW-156 - added test for extended timeout period, and docs for adding the .endpoint config files into the UserGuide. Modified: trunk/docs/docbook/userguide/src/main/module/deploy.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-01-28 17:16:14 UTC (rev 481) +++ trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -243,4 +243,78 @@ </para> </section> + <section> + <title>Changing Endpoint Configuration Properties</title> + + <para> + Apache ODE provides the means to customise certain properties, associated with a + BPEL endpoint, by specifying the properties in a file with an extension of + <filename>.endpoint</filename>. + </para> + + <para> + For information on the properties that can be specified in this file, + please see the Apache ODE documentation, located at: + <ulink url="http://ode.apache.org/endpoint-configuration.html" >http://ode.apache.org/endpoint-configuration.html</ulink>. + </para> + + <para> + This section explains how to deploy these <filename>.endpoint</filename> + files as part of a RiftSaw deployment. + </para> + + <para> + Apache ODE supports two locations for finding these <filename>.endpoint</filename> + files. A 'global' configuration folder, which by default is + <filename>ode/WEB-INF/conf</filename>, and a process deployment specific + location, which is <filename>ode/WEB-INF/processes/$your_process</filename>. + Properties associated with the 'global' configuration override any property + values provided in the process specific location. + </para> + + <para> + RiftSaw currently does not support a 'global' configuration location, so it + will only obtain the configuration files from the deployed BPEL bundle. More + specifically, from the root location within the BPEL deployment unit, along + side the BPEL deployment descriptor. + </para> + + <para> + So, for example, if you place a file called <filename>test.endpoint</filename> + in the <filename>${RiftSaw}/samples/quickstart/hello_world/bpelContent</filename> + folder, with the following content: + </para> + + <informalexample> + <programlisting> + # 3 minutes + mex.timeout=180000 + </programlisting> + </informalexample> + + <para> + then once deployed, the helloworld example could wait up to a maximum of 3 minutes to respond. + To test this out, edit the <filename>hello_world.bpel</filename> and insert + a <emphasis>wait</emphasis> activity before the response - similar to the + following: + </para> + + <informalexample> + <programlisting role="XML" ><![CDATA[ + <wait> + <for>'PT150S'</for> + </wait> + ]]></programlisting> + </informalexample> + + <para> + This will wait 2 minutes 30 seconds before responding, which is 30 seconds + more than the default timeout, but still within the new timeout period + specified within the <filename>test.endpoint</filename> file. If you then + wish to try forcing the timeout to occur, simply increase the wait + duration to 3 minutes 30 seconds, and resubmit the test message using the + <emphasis>ant sendhello</emphasis> command. + </para> + + </section> </chapter> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-01-28 17:16:14 UTC (rev 481) +++ trunk/integration-tests/build.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -123,6 +123,7 @@ <mkdir dir="target/tests"/> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,51 @@ +/* + * 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.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_hello_world_extended_timeout sample. + */ +public class QuickstartBPELHelloWorldExtendedTimeoutTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_hello_world_extended_timeout"; + + public QuickstartBPELHelloWorldExtendedTimeoutTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(QuickstartBPELHelloWorldExtendedTimeoutTestCase.class, + TEST_NAME, "Quickstart_bpel_hello_world_extended_timeout-1.jar")); + } + + public void testSendHello() throws Exception { + String result=sendSOAPMessage("hello_request1.xml", + "http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"); + + assertMessageFromFile(result, "hello_response1.xml"); + } +} Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.bpel 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,71 @@ +<!-- + ~ 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="HelloWorldExtendedTimeout" + 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="HelloWorld.wsdl" + namespace="http://www.jboss.org/bpel/examples/wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="helloPartnerLink" + partnerLinkType="intf:HelloPartnerLinkType" + myRole="me" /> + </partnerLinks> + + <variables> + <variable name="myVar" messageType="intf:HelloMessage"/> + <variable name="mesgVar" type="xsd:string"/> + </variables> + + <sequence> + <receive + name="start" + partnerLink="helloPartnerLink" + portType="intf:HelloExtendedTimeoutPortType" + operation="hello" + variable="myVar" + createInstance="yes"/> + + <assign name="assignHelloMesg"> + <copy> + <from variable="myVar" part="TestPart"/> + <to variable="mesgVar"/> + </copy> + <copy> + <from>concat($mesgVar,' World')</from> + <to variable="myVar" part="TestPart"/> + </copy> + </assign> + <wait> + <for>'PT150S'</for> + </wait> + <reply name="end" + partnerLink="helloPartnerLink" + portType="intf:HelloExtendedTimeoutPortType" + operation="hello" + variable="myVar"/> + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/HelloWorld.wsdl 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,67 @@ +<?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:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + + <wsdl:message name="HelloMessage"> + <wsdl:part name="TestPart" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="HelloExtendedTimeoutPortType"> + <wsdl:operation name="hello"> + <wsdl:input message="tns:HelloMessage" name="TestIn"/> + <wsdl:output message="tns:HelloMessage" name="TestOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloExtendedTimeoutSoapBinding" type="tns:HelloExtendedTimeoutPortType"> + <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"/> + </wsdl:input> + <wsdl:output> + <soap:body + namespace="http://www.jboss.org/bpel/examples/wsdl" + use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloExtendedTimeoutService"> + <wsdl:port name="HelloExtendedTimeoutPort" binding="tns:HelloExtendedTimeoutSoapBinding"> + <soap:address location="http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="HelloPartnerLinkType"> + <plnk:role name="me" portType="tns:HelloExtendedTimeoutPortType"/> + <plnk:role name="you" portType="tns:HelloExtendedTimeoutPortType"/> + </plnk:partnerLinkType> +</wsdl:definitions> + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/bpel-deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/bpel-deploy.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -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:HelloWorldExtendedTimeout"> + <active>true</active> + <provide partnerLink="helloPartnerLink"> + <service name="intf:HelloExtendedTimeoutService" port="HelloExtendedTimeoutPort"/> + </provide> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,4 @@ + +# 3 minutes +mex.timeout=180000 + Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,30 @@ +<project name="Quickstart_bpel_hello_world_extended_timeout" 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/samples/${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/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_request1.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:hello> + <TestPart>Hello</TestPart> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/messages/hello_response1.xml 2010-01-29 14:03:01 UTC (rev 482) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><Test... World</TestPart></odens:helloResponse></env:Body></env:Envelope> \ No newline at end of file