Author: objectiser Date: 2010-10-05 09:32:28 -0400 (Tue, 05 Oct 2010) New Revision: 1015 Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.classpath branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.project branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.classpath branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.project trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/ trunk/console/bpaf/ trunk/integration-tests/build.xml Log: RIFTSAW-296 - ODE could not handle providing a WSDL service with multiple ports. Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-10-05 08:32:39 UTC (rev 1014) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-10-05 13:32:28 UTC (rev 1015) @@ -236,19 +236,25 @@ // closure to handle the route. List<PartnerLinkMyRoleImpl.RoutingInfo> routings = null; for (PartnerLinkMyRoleImpl target : targets) { - routings = target.findRoute(mex); - boolean createInstance = target.isCreateInstance(mex); + + if (target.getMyRoleOperation(mex.getOperationName()) != null) { + routings = target.findRoute(mex); + + if (routings != null) { + boolean createInstance = target.isCreateInstance(mex); + + if (mex.getStatus() != MessageExchange.Status.FAILURE) { + for (PartnerLinkMyRoleImpl.RoutingInfo routing : routings) { + routed = routed || invokeHandler.invoke(target, routing, createInstance); + } + } + if (routed) { + break; + } + } + } + } - if (mex.getStatus() != MessageExchange.Status.FAILURE) { - for (PartnerLinkMyRoleImpl.RoutingInfo routing : routings) { - routed = routed || invokeHandler.invoke(target, routing, createInstance); - } - } - if (routed) { - break; - } - } - // Nothing found, saving for later if (!routed) { // TODO this is kind of hackish when no match and more than one myrole is selected. @@ -313,21 +319,28 @@ markused(); PartnerLinkMyRoleImpl target = null; + PortType portType = null; + Operation operation = null; for (Map.Entry<PartnerLinkMyRoleImpl,Endpoint> e : getEndpointToMyRoleMap().entrySet()) { if (e.getValue().serviceName.equals(mex.getServiceName())) { // First one is fine as we're only interested in the portType and operation here and // even if a process has 2 myrole partner links target = e.getKey(); - break; + + if (target != null) { + portType = target._plinkDef.myRolePortType; + operation = target._plinkDef.getMyRoleOperation(mex.getOperationName()); + if (operation != null) { + mex.setPortOp(portType, operation); + break; + } + } } } if (target != null) { - PortType portType = target._plinkDef.myRolePortType; - Operation operation = target._plinkDef.getMyRoleOperation(mex.getOperationName()); if (operation == null) { throw new BpelEngineException("Operation[" + mex.getOperationName() + "] could not be found on the portType [" + portType.getQName() + "]"); } - mex.setPortOp(portType, operation); } else { __log.warn("Couldn't find endpoint from service " + mex.getServiceName() + " when initializing a myRole mex."); } Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2010-10-05 08:32:39 UTC (rev 1014) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2010-10-05 13:32:28 UTC (rev 1015) @@ -283,7 +283,7 @@ : MessageExchange.MessageExchangePattern.REQUEST_RESPONSE); } - private Operation getMyRoleOperation(String operationName) { + public Operation getMyRoleOperation(String operationName) { return _plinkDef.getMyRoleOperation(operationName); } Property changes on: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db ___________________________________________________________________ Name: svn:ignore + target Property changes on: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate ___________________________________________________________________ Name: svn:ignore + target .settings Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.classpath =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.classpath (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.classpath 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,104 @@ +<classpath> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/bpm/activity-monitor-model/1.0.0-Beta1/activity-monitor-model-1.0.0-Beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/annogen/annogen/0.1.0/annogen-0.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.7/axiom-api-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-dom/1.2.7/axiom-dom-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.7/axiom-impl-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-adb/1.3/axis2-adb-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-codegen/1.3/axis2-codegen-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-java2wsdl/1.3/axis2-java2wsdl-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-kernel/1.3/axis2-kernel-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-saaj/1.3/axis2-saaj-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-saaj-api/1.3/axis2-saaj-api-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.2/commons-beanutils-1.8.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.4/commons-pool-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.1/geronimo-activation_1.1_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/components/geronimo-connector/2.0.1/geronimo-connector-2.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0/geronimo-jms_1.1_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_1.0_spec/1.1.2/geronimo-jpa_1.0_spec-1.1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/components/geronimo-transaction/2.0.1/geronimo-transaction-2.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.0.ga/hibernate-tools-3.2.0.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/org/objectweb/howl/howl/1.0.1-1/howl-1.0.1-1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0-beta1/httpcore-4.0-beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.0-beta1/httpcore-nio-4.0-beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-niossl/4.0-alpha5/httpcore-niossl-4.0-alpha5.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jencks/jencks/2.1/jencks-2.1-all.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/openjpa/openjpa/1.3.0-SNAPSHOT/openjpa-1.3.0-SNAPSHOT.jar"/> + <classpathentry kind="src" path="/riftsaw-bpel-api"/> + <classpathentry kind="src" path="/riftsaw-bpel-dao"/> + <classpathentry kind="src" path="/riftsaw-bpel-epr"/> + <classpathentry kind="src" path="/riftsaw-bpel-obj"/> + <classpathentry kind="src" path="/riftsaw-bpel-schemas"/> + <classpathentry kind="src" path="/riftsaw-dao-jpa"/> + <classpathentry kind="src" path="/riftsaw-utils"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/9.1.0.8/saxon-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-dom/9.1.0.8/saxon-dom-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/9.1.0.8/saxon-xpath-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xqj/9.1.0.8/saxon-xqj-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/serp/serp/1.13.1/serp-1.13.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.6/spring-aop-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.6/spring-dao-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jms/2.0.6/spring-jms-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-support/2.0.6/spring-support-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/woden/woden/1.0-incubating-M7b/woden-1.0-incubating-M7b.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/jencks/xapool-without-pool/1.4/xapool-without-pool-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.0/xercesImpl-2.9.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.2.0/xmlbeans-2.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/schema/XmlSchema/1.3.2/XmlSchema-1.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2/xstream-1.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.project =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.project (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/.project 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,21 @@ +<projectDescription> + <name>riftsaw-dao-jpa-hibernate</name> + <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>riftsaw-bpel-api</project> + <project>riftsaw-bpel-dao</project> + <project>riftsaw-bpel-epr</project> + <project>riftsaw-bpel-obj</project> + <project>riftsaw-bpel-schemas</project> + <project>riftsaw-dao-jpa</project> + <project>riftsaw-utils</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Property changes on: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa ___________________________________________________________________ Name: svn:ignore + target .settings Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.classpath =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.classpath (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.classpath 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,109 @@ +<classpath> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/bpm/activity-monitor-model/1.0.0-Beta1/activity-monitor-model-1.0.0-Beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/annogen/annogen/0.1.0/annogen-0.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.7/axiom-api-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-dom/1.2.7/axiom-dom-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.7/axiom-impl-1.2.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-adb/1.3/axis2-adb-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-codegen/1.3/axis2-codegen-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-java2wsdl/1.3/axis2-java2wsdl-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-kernel/1.3/axis2-kernel-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-saaj/1.3/axis2-saaj-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2-saaj-api/1.3/axis2-saaj-api-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.2/commons-beanutils-1.8.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.4/commons-pool-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.1/geronimo-activation_1.1_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/components/geronimo-connector/2.0.1/geronimo-connector-2.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_1.0_spec/1.1.2/geronimo-jpa_1.0_spec-1.1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/components/geronimo-transaction/2.0.1/geronimo-transaction-2.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/objectweb/howl/howl/1.0.1-1/howl-1.0.1-1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0-beta1/httpcore-4.0-beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.0-beta1/httpcore-nio-4.0-beta1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-niossl/4.0-alpha5/httpcore-niossl-4.0-alpha5.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jencks/jencks/2.1/jencks-2.1-all.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/openjpa/openjpa/1.3.0-SNAPSHOT/openjpa-1.3.0-SNAPSHOT.jar"/> + <classpathentry kind="src" path="/riftsaw-bpel-api"/> + <classpathentry kind="src" path="/riftsaw-bpel-dao"/> + <classpathentry kind="src" path="/riftsaw-bpel-epr"/> + <classpathentry kind="src" path="/riftsaw-bpel-obj"/> + <classpathentry kind="src" path="/riftsaw-bpel-schemas"/> + <classpathentry kind="src" path="/riftsaw-dao-jpa"/> + <classpathentry kind="src" path="/riftsaw-utils"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/9.1.0.8/saxon-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-dom/9.1.0.8/saxon-dom-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/9.1.0.8/saxon-xpath-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xqj/9.1.0.8/saxon-xqj-9.1.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/serp/serp/1.13.1/serp-1.13.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.6/spring-aop-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.6/spring-dao-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jms/2.0.6/spring-jms-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-support/2.0.6/spring-support-2.0.6.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/woden/woden/1.0-incubating-M7b/woden-1.0-incubating-M7b.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/jencks/xapool-without-pool/1.4/xapool-without-pool-1.4.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.0/xercesImpl-2.9.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.2.0/xmlbeans-2.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/schema/XmlSchema/1.3.2/XmlSchema-1.3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2/xstream-1.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.project =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.project (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/.project 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,21 @@ +<projectDescription> + <name>riftsaw-dao-jpa-ojpa</name> + <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>riftsaw-bpel-api</project> + <project>riftsaw-bpel-dao</project> + <project>riftsaw-bpel-epr</project> + <project>riftsaw-bpel-obj</project> + <project>riftsaw-bpel-schemas</project> + <project>riftsaw-dao-jpa</project> + <project>riftsaw-utils</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Property changes on: trunk/console/bpaf ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-10-05 08:32:39 UTC (rev 1014) +++ trunk/integration-tests/build.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -170,8 +170,9 @@ <ant antfile="src/test/resources/testcases/RiftSaw_70/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_209/build.xml" /> <ant antfile="src/test/resources/testcases/RiftSaw_278/build.xml" /> - <ant antfile="src/test/resources/testcases/RiftSaw_279/build.xml" /> - <ant antfile="src/test/resources/testcases/RiftSaw_285/build.xml" /> + <ant antfile="src/test/resources/testcases/RiftSaw_279/build.xml" /> + <ant antfile="src/test/resources/testcases/RiftSaw_285/build.xml" /> + <ant antfile="src/test/resources/testcases/RiftSaw_296/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint1/build.xml" /> <ant antfile="src/test/resources/tutorials/BluePrint2/build.xml" /> Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,60 @@ +/* + * 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 RiftSaw_296 + */ +public class RiftSaw296TestCase extends RiftSawTest { + + private static final String TEST_NAME = "RiftSaw_296"; + + public RiftSaw296TestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(RiftSaw296TestCase.class, + TEST_NAME, "RiftSaw_296-1.jar")); + } + + public void testSendHello() throws Exception { + String result1=sendSOAPMessage("hello_request1.xml", + "http://localhost:8080/RiftSaw_296WS1"); + + result1 = processResult(result1); + + assertMessageFromFile(result1, "hello_response1.xml"); + + String result2=sendSOAPMessage("goodbye_request1.xml", + "http://localhost:8080/RiftSaw_296WS2"); + + result2 = processResult(result2); + + assertMessageFromFile(result2, "goodbye_response1.xml"); + } +} Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,115 @@ +<!-- + ~ 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="helloPartnerLink" + partnerLinkType="intf:HelloPartnerLinkType" + myRole="me" /> + <partnerLink name="goodbyePartnerLink" + partnerLinkType="intf:GoodbyePartnerLinkType" + 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="helloPartnerLink" + portType="intf:HelloPortType" + 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="helloPartnerLink" + portType="intf:HelloPortType" + operation="hello" + variable="myHelloVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + <receive + name="start" + partnerLink="goodbyePartnerLink" + portType="intf:GoodbyePortType" + 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="goodbyePartnerLink" + portType="intf:GoodbyePortType" + operation="goodbye" + variable="myGoodbyeVar"> + <correlations> + <correlation set="Session" initiate="no" /> + </correlations> + </reply> + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,130 @@ +<?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:complexType name="SessionIdentity"> + <xsd:sequence> + <xsd:element name="id" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="HelloMessage"> + <wsdl:part name="ID" type="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:message name="GoodbyeMessage"> + <wsdl:part name="ID" type="types:SessionIdentity"/> + <wsdl:part name="Message" type="xsd:string"/> + </wsdl:message> + + <wsdl:portType name="HelloPortType"> + <wsdl:operation name="hello"> + <wsdl:input message="tns:HelloMessage" name="HelloIn"/> + <wsdl:output message="tns:HelloMessage" name="HelloOut"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:portType name="GoodbyePortType"> + <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="HelloSoapBinding" type="tns:HelloPortType"> + <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:binding name="GoodbyeSoapBinding" type="tns:GoodbyePortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="goodbye"> + <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="HelloGoodbyeService"> + <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> + <soap:address location="http://localhost:8080/RiftSaw_296WS1"/> + </wsdl:port> + <wsdl:port name="GoodbyePort" binding="tns:GoodbyeSoapBinding"> + <soap:address location="http://localhost:8080/RiftSaw_296WS2"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="HelloPartnerLinkType"> + <plnk:role name="me" portType="tns:HelloPortType"/> + <plnk:role name="you" portType="tns:HelloPortType"/> + </plnk:partnerLinkType> + + <plnk:partnerLinkType name="GoodbyePartnerLinkType"> + <plnk:role name="me" portType="tns:GoodbyePortType"/> + <plnk:role name="you" portType="tns:GoodbyePortType"/> + </plnk:partnerLinkType> + + <vprop:property name="SessionID" type="xsd:int" /> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:HelloMessage" part="ID"> + <vprop:query>id</vprop:query> + </vprop:propertyAlias> + + <vprop:propertyAlias propertyName="tns:SessionID" + messageType="tns:GoodbyeMessage" part="ID"> + <vprop:query>id</vprop:query> + </vprop:propertyAlias> + + +</wsdl:definitions> + Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,32 @@ +<!-- + ~ 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> + <provide partnerLink="helloPartnerLink"> + <service name="intf:HelloGoodbyeService" port="HelloPort"/> + </provide> + <provide partnerLink="goodbyePartnerLink"> + <service name="intf:HelloGoodbyeService" port="GoodbyePort"/> + </provide> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,29 @@ +<project name="RiftSaw_296" 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_296/messages/goodbye_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,11 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:goodbye> + <ID> + <id>1</id> + </ID> + <Message>Goodbye</Message> + </wsdl:goodbye> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><ID> + <id>1</id> + </ID><Message>Goodbye World</Message></odens:goodbyeResponse></env:Body></env:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,11 @@ +<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> + <ID> + <id>1</id> + </ID> + <Message>Hello</Message> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml 2010-10-05 13:32:28 UTC (rev 1015) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><ID> + <id>1</id> + </ID><Message>Hello World</Message></odens:helloResponse></env:Body></env:Envelope> \ No newline at end of file