Author: jeff.yuchang Date: 2010-11-24 06:14:51 -0500 (Wed, 24 Nov 2010) New Revision: 1143 Added: branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw312TestCase.java branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcess.bpel branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcessArtifacts.wsdl branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/deploy.xml branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/build.xml branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/request.xml branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/response.xml Modified: branches/RiftSaw-2.2.x/distribution/src/main/release/install/deployment.properties branches/RiftSaw-2.2.x/integration-tests/build.xml branches/RiftSaw-2.2.x/pom.xml Log: * RIFTSAW-312, fix the boolean data type. Modified: branches/RiftSaw-2.2.x/distribution/src/main/release/install/deployment.properties =================================================================== --- branches/RiftSaw-2.2.x/distribution/src/main/release/install/deployment.properties 2010-11-24 11:01:26 UTC (rev 1142) +++ branches/RiftSaw-2.2.x/distribution/src/main/release/install/deployment.properties 2010-11-24 11:14:51 UTC (rev 1143) @@ -15,8 +15,8 @@ org_jboss_as_config=default # The directory for JBossESB home -# (e.g. /var/local/jbossesb-4.8) -org_jboss_esb_home=/var/local/jbossesb-4.8 +# (e.g. /var/local/jbossesb-4.9) +org_jboss_esb_home=/var/local/jbossesb-4.9 # database # (e.g. hsql postgres mysql) Modified: branches/RiftSaw-2.2.x/integration-tests/build.xml =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/build.xml 2010-11-24 11:01:26 UTC (rev 1142) +++ branches/RiftSaw-2.2.x/integration-tests/build.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -190,6 +190,7 @@ <ant antfile="src/test/resources/testcases/RiftSaw_296/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_299_peer/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_299_ws/build.xml" /> + <ant antfile="src/test/resources/testcases/RiftSaw_312/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint1/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint2/build.xml" /> Added: branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw312TestCase.java =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw312TestCase.java (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw312TestCase.java 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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 312 testcase. + */ +public class RiftSaw312TestCase extends RiftSawTest { + + private static final String TEST_NAME = "RiftSaw_312"; + + public RiftSaw312TestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(RiftSaw312TestCase.class, + TEST_NAME, "RiftSaw_312-1.jar")); + } + + public void testSendHello() throws Exception { + + String result1=sendSOAPMessage("request.xml", + "http://localhost:8080/RiftSaw_312WS"); + result1 = processResult(result1); + + assertMessageFromFile(result1, "response.xml"); + } +} Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcess.bpel =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcess.bpel (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcess.bpel 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,66 @@ +<bpel:process name="VariableTypesProcess" + targetNamespace="http://sample.bpel.org/bpel/sample" + suppressJoinFailure="yes" + xmlns:tns="http://sample.bpel.org/bpel/sample" + xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... + + <bpel:import location="VariableTypesProcessArtifacts.wsdl" + namespace="http://sample.bpel.org/bpel/sample" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <bpel:partnerLinks> + <bpel:partnerLink name="client" + partnerLinkType="tns:VariableTypesProcess" + myRole="VariableTypesProcessProvider"/> + </bpel:partnerLinks> + + <bpel:variables> + <bpel:variable name="input" messageType="tns:BooleanMessage"/> + <bpel:variable name="output" messageType="tns:StringMessage"/> + </bpel:variables> + + <bpel:sequence name="main"> + + <bpel:receive name="receiveInput" + partnerLink="client" + portType="tns:VariableTypesProcess" + operation="booleanToString" + variable="input" + createInstance="yes"/> + + + <bpel:if name="boolean"> + <bpel:condition>$input.boolean</bpel:condition> + + <bpel:assign validate="no" name="assignTrueString"> + <bpel:copy> + <bpel:from> + <bpel:literal>true</bpel:literal> + </bpel:from> + <bpel:to part="string" variable="output"/> + </bpel:copy> + </bpel:assign> + + <bpel:else> + <bpel:assign validate="no" name="assignFalseString"> + <bpel:copy> + <bpel:from> + <bpel:literal>false</bpel:literal> + </bpel:from> + <bpel:to part="string" variable="output"/> + </bpel:copy> + </bpel:assign> + </bpel:else> + + </bpel:if> + + + <bpel:reply name="replyOutput" + partnerLink="client" + portType="tns:VariableTypesProcess" + operation="booleanToString" + variable="output" /> + + </bpel:sequence> +</bpel:process> + Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcessArtifacts.wsdl =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcessArtifacts.wsdl (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/VariableTypesProcessArtifacts.wsdl 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8" ?> + +<definitions name="VariableTypesProcess" + targetNamespace="http://sample.bpel.org/bpel/sample" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://sample.bpel.org/bpel/sample" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <types> + </types> + + <message name="BooleanMessage"> + <part name="boolean" type="xsd:boolean"/> + </message> + <message name="StringMessage"> + <part name="string" type="xsd:string"/> + </message> + + <portType name="VariableTypesProcess"> + <operation name="booleanToString"> + <input message="tns:BooleanMessage" /> + <output message="tns:StringMessage"/> + </operation> + </portType> + + + <binding name="VariableTypesBinding" type="tns:VariableTypesProcess"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="booleanToString"> + <soap:operation soapAction="" style="rpc" /> + <input> + <soap:body namespace="http://sample.bpel.org/bpel/sample" use="literal" /> + </input> + <output> + <soap:body namespace="http://sample.bpel.org/bpel/sample" use="literal" /> + </output> + </operation> + </binding> + + <service name="VariableTypesProcess"> + <port name="VariableTypesProcessPort" binding="tns:VariableTypesBinding"> + <soap:address location="http://localhost:8080/RiftSaw_312WS" /> + </port> + </service> + + <plnk:partnerLinkType name="VariableTypesProcess"> + <plnk:role name="VariableTypesProcessProvider" portType="tns:VariableTypesProcess"/> + </plnk:partnerLinkType> + +</definitions> \ No newline at end of file Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/deploy.xml =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/deploy.xml (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/bpel/deploy.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:sample="http://sample.bpel.org/bpel/sample"> + <process name="sample:VariableTypesProcess"> + <active>true</active> + <retired>false</retired> + <provide partnerLink="client"> + <service name="sample:VariableTypesProcess" port="VariableTypesProcessPort"/> + </provide> + </process> +</deploy> \ No newline at end of file Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/build.xml =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/build.xml (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/build.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,29 @@ +<project name="RiftSaw_312" 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: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/request.xml =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/request.xml (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/request.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:sam="http://sample.bpel.org/bpel/sample"> + <soapenv:Header/> + <soapenv:Body> + <sam:booleanToString> + <boolean>false</boolean> + </sam:booleanToString> + </soapenv:Body> +</soapenv:Envelope> Added: branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/response.xml =================================================================== --- branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/response.xml (rev 0) +++ branches/RiftSaw-2.2.x/integration-tests/src/test/resources/testcases/RiftSaw_312/messages/response.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:odens='http://sample.bpel.org/bpel/sample'><string>... \ No newline at end of file Modified: branches/RiftSaw-2.2.x/pom.xml =================================================================== --- branches/RiftSaw-2.2.x/pom.xml 2010-11-24 11:01:26 UTC (rev 1142) +++ branches/RiftSaw-2.2.x/pom.xml 2010-11-24 11:14:51 UTC (rev 1143) @@ -85,7 +85,7 @@ </profiles> <properties> - <riftsaw.ode.version>2.2.0.CR1</riftsaw.ode.version> + <riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> <bpel.console.version>2.2.3-Final</bpel.console.version> <activity.monitor.model.version>1.0.0-Beta2</activity.monitor.model.version>