From hise-commits-return-270-apmail-incubator-hise-commits-archive=incubator.apache.org@incubator.apache.org Thu Aug 19 17:40:32 2010 Return-Path: Delivered-To: apmail-incubator-hise-commits-archive@minotaur.apache.org Received: (qmail 12472 invoked from network); 19 Aug 2010 17:40:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Aug 2010 17:40:32 -0000 Received: (qmail 65087 invoked by uid 500); 19 Aug 2010 17:40:32 -0000 Delivered-To: apmail-incubator-hise-commits-archive@incubator.apache.org Received: (qmail 65070 invoked by uid 500); 19 Aug 2010 17:40:32 -0000 Mailing-List: contact hise-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hise-dev@incubator.apache.org Delivered-To: mailing list hise-commits@incubator.apache.org Received: (qmail 65063 invoked by uid 99); 19 Aug 2010 17:40:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Aug 2010 17:40:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Aug 2010 17:40:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B0C1723888E8; Thu, 19 Aug 2010 17:39:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r987243 [1/3] - in /incubator/hise/trunk: hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/ hise-distro/src/distro/examples/war/claimsHandling/ hise-examples/osgi/claimsHandling-bundle/src/main/resources/ hise-examples... Date: Thu, 19 Aug 2010 17:39:07 -0000 To: hise-commits@incubator.apache.org From: rr@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100819173907.B0C1723888E8@eris.apache.org> Author: rr Date: Thu Aug 19 17:39:07 2010 New Revision: 987243 URL: http://svn.apache.org/viewvc?rev=987243&view=rev Log: HISE-83: Improve definition of tasks for the tests integration and examples. They should be consistent with the schema. (Thanks to Michał Więcław) Modified: incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/testHtd1.xml incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling-soapui-project.xml incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling.xml incubator/hise/trunk/hise-examples/osgi/claimsHandling-bundle/src/main/resources/Htd1.xml incubator/hise/trunk/hise-examples/war/claimsHandling/claimsHandling.xml incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml incubator/hise/trunk/itest/delegation.xml Modified: incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/testHtd1.xml URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/testHtd1.xml?rev=987243&r1=987242&r2=987243&view=diff ============================================================================== --- incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/testHtd1.xml (original) +++ incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/src/main/resources/testHtd1.xml Thu Aug 19 17:39:07 2010 @@ -1,443 +1,127 @@ - - - - - - - - Employee group. - - + - - - - - - + - + This task is used to handle claims that require manual approval. - - htd:getInput("ClaimApprovalRequest")/priority - + + + + + xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) + + + - - - - - user1 - - - - + + + + + user1 + + + + - + - - - - - group1 - group2 - - - - + + + + + user1 + user2 + + + + - - - - - user1 - user2 - - - - - - - - - - - user3 - - - - - - + + + + + user3 + + + + + + - - - Approve Claim + Approve Claim - htd:getInput("ClaimApprovalRequest")/cust/firstname + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) + - htd:getInput("ClaimApprovalRequest")/cust/lastname + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) + - htd:getInput("ClaimApprovalRequest")/amount + xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) + - Approve the insurance claim for PLN $euroAmount$ on behalf of $firstname$ $lastname$ - - Approve this claim following corporate guideline #4711.0815/7 ... + + Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + + + + Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + - {htd:getInput("request")/ClaimApprovalRequest/cla:cust/cla:id/text()} + {htd:getInput("ClaimApprovalRequest")/cla:cust/cla:id/text()} {$outcome} ]]> - - - 'PT5S' - - - - - - - - user3 - - - - - - - - - - - - - 'PT5S' - - - - - {htd:getInput("request")/ClaimApprovalRequest/cla:cust/cla:firstname/text()} - {htd:getInput("request")/ClaimApprovalRequest/cla:cust/cla:lastname/text()} - {$taskId} - - ]]> - - - - - - - - 'PT10S' - - - - - - - - user4 - - - - - - - - - - - - - - - This task is used to handle claims that require manual approval. - - htd:getInput("ClaimApprovalRequest")/prio - - - - - - - - - user1 - user2 - - - - - - - - - - - - group1 - group2 - - - - - - - - - - - - user1 - user2 - - - - - - - - - - - - - - user3 - - - - - - - - - - - - - Approve Claim - - - - - htd:getInput("ClaimApprovalRequest")/cust/firstname - - - htd:getInput("ClaimApprovalRequest")/cust/lastname - - - htd:getInput("ClaimApprovalRequest")/amount - - - - Approve the insurance claim for PLN $euroAmount$ on behalf of $firstname$ $lastname$ - - Approve this claim following corporate guideline #4711.0815/7 ... - - - - - - - - - - This task is used to handle claims that require manual approval. - - - - - - - - - user1 - - - - - - - - - - - - user2 - - - - - - - - - - Approve Claim - - - - - htd:getInput("ClaimApprovalRequest")/cust/firstname - - - htd:getInput("ClaimApprovalRequest")/cust/lastname - - - htd:getInput("ClaimApprovalRequest")/amount - - - - Approve the insurance claim for PLN $euroAmount$ on behalf of $firstname$ $lastname$ - - Approve this claim following corporate guideline #4711.0815/7 ... + + true - + + + - - - PT5S - - - - - - - - user3 - - - - - - - - - - - - PT5S - - - - - - - - - PT10S - - - - - - - - user4 - - - - - - - - - - - - - - - - - - - - - - user5 - - - - - - - - Notify2Name - Name2Subject - - - Modified: incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling-soapui-project.xml URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling-soapui-project.xml?rev=987243&r1=987242&r2=987243&view=diff ============================================================================== --- incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling-soapui-project.xml (original) +++ incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling-soapui-project.xml Thu Aug 19 17:39:07 2010 @@ -3095,7 +3095,7 @@ Business Machines Corporation, Oracle In -]]>user1pass1tid1941tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPgetMyTasks<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user1pass1tid801 tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPgetMyTasks<xml-fragment/> UTF-8http://localhost:8080/hise/taskOperations/ @@ -3156,7 +3156,7 @@ count(*/*/htd:getMyTasksResponse) -]]>user1pass1tid1942tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ -10 ]]>user1user1passtaskOperationsSOAPrelease<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user1pass1tid802 tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ -10 ]]>user1user1passtaskOperationsSOAPrelease<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ @@ -3272,7 +3272,7 @@ declare namespace ns1='http://www.exampl -]]>user1pass1tid1943tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user1pass1tid803 tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/> UTF-8http://localhost:8080/hise/taskOperations/ @@ -3317,7 +3317,7 @@ declare namespace ns1='http://www.exampl -]]>user1pass1tid1944tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPforward<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user1pass1tid804 tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPforward<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ @@ -3360,7 +3360,7 @@ declare namespace ns1='http://www.exampl -]]>user2user2passtid1945tid2Responseapprove<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPgetAttachmentInfos<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user2user2passtid805tid2Responseapprove<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPgetAttachmentInfos<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ @@ -3461,7 +3461,7 @@ declare namespace ns1='http://www.exampl -]]>user2user2passtid1946tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user2user2passtid806tidResponseapprove - Request 1<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ @@ -3539,7 +3539,7 @@ declare namespace ns1='http://www.exampl -]]>user2user2passtid1947ttidResponseapprove<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<x ml-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ +]]>user2user2passtid807ttidResponseapprove<a>{*/*/*/text()}</a>tidPropertiestaskOperationsSOAPstart<xm l-fragment/>UTF-8http://localhost:8080/hise/taskOperations/ Modified: incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling.xml URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling.xml?rev=987243&r1=987242&r2=987243&view=diff ============================================================================== --- incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling.xml (original) +++ incubator/hise/trunk/hise-distro/src/distro/examples/war/claimsHandling/claimsHandling.xml Thu Aug 19 17:39:07 2010 @@ -6,65 +6,77 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.insurance.example.com/claims" + xmlns:cla="http://www.insurance.example.com/claims" targetNamespace="http://www.insurance.example.com/claims" xsi:schemaLocation="http://www.example.org/WS-HT file:/usr/share/schemas/ws-humantask.xsd"> + - This task is used to handle claims that require manual approval. - - - declare namespace cla="http://www.insurance.example.com/claims"; - declare namespace htd="http://www.example.org/WS-HT"; - xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) + This task is used to handle claims that require manual approval. + + + + + xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) - - - + + - - - - - user1 - - - - + + + + + user1 + + + + - - - - - group1 - group2 - - - user1 - user2 - - - - + + + + + user1 + user2 + + + + + + + + + + + + group1 + group2 + + + + - - - - - user3 - - - - - + + + + + user3 + + + + + + @@ -74,28 +86,26 @@ -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) - + xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) + - Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + + Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + - Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + + Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + @@ -108,8 +118,10 @@ xs:double(htd:getInput("ClaimApprovalReq ]]> - true - + true + + - + + Modified: incubator/hise/trunk/hise-examples/osgi/claimsHandling-bundle/src/main/resources/Htd1.xml URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-examples/osgi/claimsHandling-bundle/src/main/resources/Htd1.xml?rev=987243&r1=987242&r2=987243&view=diff ============================================================================== --- incubator/hise/trunk/hise-examples/osgi/claimsHandling-bundle/src/main/resources/Htd1.xml (original) +++ incubator/hise/trunk/hise-examples/osgi/claimsHandling-bundle/src/main/resources/Htd1.xml Thu Aug 19 17:39:07 2010 @@ -1,82 +1,82 @@ - - - - + - - - + - + This task is used to handle claims that require manual approval. - - - declare namespace cla="http://www.insurance.example.com/claims"; - declare namespace htd="http://www.example.org/WS-HT"; - xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) + + + + + xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) - - true - + + - - - - - user1 - - - - + + + + + user1 + + + + - - - - - group1 - group2 - - - user1 - user2 - - - - + + + + + user1 + user2 + + + + + + + + + + + + group1 + group2 + + + + - - - - - user3 - - - - - + + + + + user3 + + + + + + @@ -86,28 +86,26 @@ Business Machines Corporation, Oracle In -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) - + xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) + - Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + + Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + - Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + + Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + @@ -120,7 +118,10 @@ xs:double(htd:getInput("ClaimApprovalReq ]]> - + true + + - + + Modified: incubator/hise/trunk/hise-examples/war/claimsHandling/claimsHandling.xml URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-examples/war/claimsHandling/claimsHandling.xml?rev=987243&r1=987242&r2=987243&view=diff ============================================================================== --- incubator/hise/trunk/hise-examples/war/claimsHandling/claimsHandling.xml (original) +++ incubator/hise/trunk/hise-examples/war/claimsHandling/claimsHandling.xml Thu Aug 19 17:39:07 2010 @@ -6,65 +6,77 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.insurance.example.com/claims" + xmlns:cla="http://www.insurance.example.com/claims" targetNamespace="http://www.insurance.example.com/claims" xsi:schemaLocation="http://www.example.org/WS-HT file:/usr/share/schemas/ws-humantask.xsd"> + - This task is used to handle claims that require manual approval. - - - declare namespace cla="http://www.insurance.example.com/claims"; - declare namespace htd="http://www.example.org/WS-HT"; - xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) + This task is used to handle claims that require manual approval. + + + + + xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio) - - - + + - - - - - user1 - - - - + + + + + user1 + + + + - - - - - group1 - group2 - - - user1 - user2 - - - - + + + + + user1 + user2 + + + + + + + + + + + + group1 + group2 + + + + - - - - - user3 - - - - - + + + + + user3 + + + + + + @@ -74,28 +86,26 @@ -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) - + xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname) + -declare namespace cla="http://www.insurance.example.com/claims"; -declare namespace htd="http://www.example.org/WS-HT"; -xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) - + xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount) + - Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + + Approve the insurance claim for PLN {$euroAmount} on behalf of {$firstname} {$lastname} + - Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + + Approve this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} + @@ -108,8 +118,10 @@ xs:double(htd:getInput("ClaimApprovalReq ]]> - true - + true + + - + +