riftsaw SVN: r1023 - in trunk/integration-tests: src/test/java/org/jboss/soa/bpel/tests and 2 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-10-06 14:42:15 -0400 (Wed, 06 Oct 2010)
New Revision: 1023
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanApprovalTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanFaultTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvoke2TestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvokeTestCase.java
Removed:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanApprovalTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java
Modified:
trunk/integration-tests/pom.xml
Log:
RIFTSAW-170 - separate out ESB tests so integration tests can be performed when ESB is not installed.
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/pom.xml 2010-10-06 18:42:15 UTC (rev 1023)
@@ -532,68 +532,156 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
- </additionalClasspathElements>
- <systemProperties>
- <property>
- <name>test.dir</name>
- <value>${basedir}/target/tests</value>
- </property>
- <property>
- <name>ws.stack</name>
- <value>${ws.stack}</value>
- </property>
- <property>
- <name>test.delay</name>
- <value>${test.delay}</value>
- </property>
- <property>
- <name>java.naming.factory.initial</name>
- <value>org.jnp.interfaces.NamingContextFactory</value>
- </property>
- <property>
- <name>java.naming.factory.url.pkgs</name>
- <value>org.jboss.naming:org.jnp.interfaces</value>
- </property>
- <property>
- <name>java.naming.provider.url</name>
- <value>jnp://localhost:1099</value>
- </property>
- <property>
- <name>java.rmi.server.ignoreStubClasses</name>
- <value>true</value>
- </property>
- </systemProperties>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*Test.java</include>
- </includes>
- <!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 -->
- <excludes>
- <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>test-riftsaw</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>testesb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
+ </additionalClasspathElements>
+ <systemProperties>
+ <property>
+ <name>test.dir</name>
+ <value>${basedir}/target/tests</value>
+ </property>
+ <property>
+ <name>ws.stack</name>
+ <value>${ws.stack}</value>
+ </property>
+ <property>
+ <name>test.delay</name>
+ <value>${test.delay}</value>
+ </property>
+ <property>
+ <name>java.naming.factory.initial</name>
+ <value>org.jnp.interfaces.NamingContextFactory</value>
+ </property>
+ <property>
+ <name>java.naming.factory.url.pkgs</name>
+ <value>org.jboss.naming:org.jnp.interfaces</value>
+ </property>
+ <property>
+ <name>java.naming.provider.url</name>
+ <value>jnp://localhost:1099</value>
+ </property>
+ <property>
+ <name>java.rmi.server.ignoreStubClasses</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 -->
+ <excludes>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test-riftsaw-with-esb</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>testnoesb</id>
+ <activation>
+ <property>
+ <name>testesb</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
+ </additionalClasspathElements>
+ <systemProperties>
+ <property>
+ <name>test.dir</name>
+ <value>${basedir}/target/tests</value>
+ </property>
+ <property>
+ <name>ws.stack</name>
+ <value>${ws.stack}</value>
+ </property>
+ <property>
+ <name>test.delay</name>
+ <value>${test.delay}</value>
+ </property>
+ <property>
+ <name>java.naming.factory.initial</name>
+ <value>org.jnp.interfaces.NamingContextFactory</value>
+ </property>
+ <property>
+ <name>java.naming.factory.url.pkgs</name>
+ <value>org.jboss.naming:org.jnp.interfaces</value>
+ </property>
+ <property>
+ <name>java.naming.provider.url</name>
+ <value>jnp://localhost:1099</value>
+ </property>
+ <property>
+ <name>java.rmi.server.ignoreStubClasses</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 -->
+ <excludes>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/esb/**/*TestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/esb/**/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test-riftsaw-without-esb</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<reporting>
<plugins>
<plugin>
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,50 @@
+/*
+ * 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.esb;
+
+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 QuickstartESBBPELHelloWorldExtendedTimeoutTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world_extended_timeout";
+
+ public QuickstartESBBPELHelloWorldExtendedTimeoutTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.class,
+ TEST_NAME, "Quickstart_esb_bpel_hello_world_extended_timeout.esb,../Quickstart_bpel_hello_world_extended_timeout/Quickstart_bpel_hello_world_extended_timeout-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello", 180000);
+
+ assertMessage(result, "Hello World via ESB to BPEL World");
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,55 @@
+/*
+ * 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.esb;
+
+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_no_extended_timeout sample.
+ */
+public class QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world_no_extended_timeout";
+
+ public QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.class,
+ TEST_NAME, "Quickstart_esb_bpel_hello_world_no_extended_timeout.esb,../Quickstart_bpel_hello_world_extended_timeout/Quickstart_bpel_hello_world_extended_timeout-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+
+ try {
+ sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello", 180000);
+
+ fail("Should have timed out due to default timeout period on BPEL process");
+ } catch(Exception e) {
+ // Ignore - should fail due to timeout
+ }
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELHelloWorldTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,50 @@
+/*
+ * 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.esb;
+
+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 sample.
+ */
+public class QuickstartESBBPELHelloWorldTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world";
+
+ public QuickstartESBBPELHelloWorldTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldTestCase.class,
+ TEST_NAME, "Quickstart_esb_bpel_hello_world.esb,../Quickstart_bpel_hello_world/Quickstart_bpel_hello_world-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello");
+
+ assertMessage(result, "Hello World via ESB to BPEL World");
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanApprovalTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanApprovalTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanApprovalTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanApprovalTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,53 @@
+/*
+ * 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.esb;
+
+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_loan_approval sample from an ESB service.
+ */
+public class QuickstartESBBPELLoanApprovalTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_esb_bpel_loan_approval";
+
+ public QuickstartESBBPELLoanApprovalTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartESBBPELLoanApprovalTestCase.class,
+ TEST_NAME, "Quickstart_esb_bpel_loan_approval.esb,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval-1.jar,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval.war"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendESBMessage("<request><firstName>Fred</firstName><name>Bloggs</name><amount>1000</amount></request>",
+ "LoanApprovalBPELESB", "LoanApproval");
+
+ if (result == null || result.contains("<accept>yes</accept>") == false) {
+ fail("Invalid result");
+ }
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanFaultTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanFaultTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartESBBPELLoanFaultTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,87 @@
+/*
+ * 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.esb;
+
+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_loan_fault sample.
+ */
+public class QuickstartESBBPELLoanFaultTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_esb_bpel_loan_fault";
+ protected static final String BODY_FAULT_CODE = "org.jboss.soa.esb.message.fault.detail.code";
+ protected static final String BODY_BPEL_FAULT_CODE = "org.jboss.soa.bpel.message.fault.detail.code";
+ protected static final String BODY_FAULT_MESSAGE = "org.jboss.soa.esb.message.fault.detail.detail";
+
+ public QuickstartESBBPELLoanFaultTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartESBBPELLoanFaultTestCase.class,
+ TEST_NAME, "Quickstart_esb_bpel_loan_fault.esb,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval-1.jar,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval.war"));
+ }
+
+ public void testSendLoanRequestZeroAmountException() throws Exception {
+ try {
+ String result=sendESBMessage("<request><firstName>Jane</firstName><name>Bloggs</name><amount>0</amount></request>",
+ "LoanFaultBPELESB", "LoanFailException");
+
+ fail("Test should have failed with FaultMessageException");
+
+ } catch(org.jboss.soa.esb.couriers.FaultMessageException fme) {
+
+ assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_FAULT_MESSAGE),
+ "<message><errorCode><integer xmlns=\"http://example.com/loan-approval/xsd/error-messages/\">1</integer></errorCode></message>");
+
+ assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_BPEL_FAULT_CODE),
+ "{http://example.com/loan-approval/wsdl/}unableToHandleRequest");
+
+ } catch(Exception e) {
+ fail("Test failed with exception: "+e);
+ }
+ }
+
+ public void testSendLoanRequestZeroAmountFaultMessage() throws Exception {
+ try {
+ String result=sendESBMessage("<request><firstName>Jane</firstName><name>Bloggs</name><amount>0</amount></request>",
+ "LoanFaultBPELESB", "LoanFailMessage");
+
+ fail("Test should have failed with FaultMessageException");
+
+ } catch(org.jboss.soa.esb.couriers.FaultMessageException fme) {
+
+ assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_FAULT_MESSAGE),
+ "<message><errorCode><integer xmlns=\"http://example.com/loan-approval/xsd/error-messages/\">1</integer></errorCode></message>");
+
+ assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_BPEL_FAULT_CODE),
+ "{http://example.com/loan-approval/wsdl/}unableToHandleRequest");
+
+ } catch(Exception e) {
+ fail("Test failed with exception: "+e);
+ }
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvoke2TestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvoke2TestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,57 @@
+/*
+ * 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.esb;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the ESB simple_esb_proxy_invoke sample.
+ */
+public class QuickstartSimpleESBProxyInvoke2TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_simple_esb_proxy_invoke2";
+
+ public QuickstartSimpleESBProxyInvoke2TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ if (System.getProperty("ws.stack","native").equals("native")) {
+ return(new RiftSawTestSetup(QuickstartSimpleESBProxyInvoke2TestCase.class,
+ TEST_NAME, "Quickstart_simple_esb_proxy_invoke2-1.jar,Quickstart_simple_esb_proxy_invoke2.war,Quickstart_simple_esb_proxy_invoke2-service.esb"));
+ } else {
+ return(new junit.framework.TestSuite());
+ }
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("hello_request1.xml",
+ "http://localhost:8080/Quickstart_bpel_simple_invokeWS");
+
+ result = processResult(result);
+
+ assertMessageFromFile(result, "hello_response1.xml");
+ }
+}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvokeTestCase.java (from rev 1012, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvokeTestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/esb/QuickstartSimpleESBProxyInvokeTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -0,0 +1,57 @@
+/*
+ * 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.esb;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the ESB simple_esb_proxy_invoke sample.
+ */
+public class QuickstartSimpleESBProxyInvokeTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_simple_esb_proxy_invoke";
+
+ public QuickstartSimpleESBProxyInvokeTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ if (System.getProperty("ws.stack","native").equals("native")) {
+ return(new RiftSawTestSetup(QuickstartSimpleESBProxyInvokeTestCase.class,
+ TEST_NAME, "Quickstart_simple_esb_proxy_invoke-1.jar,Quickstart_simple_esb_proxy_invoke.war,Quickstart_simple_esb_proxy_invoke.esb"));
+ } else {
+ return(new junit.framework.TestSuite());
+ }
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("hello_request1.xml",
+ "http://localhost:8080/Quickstart_bpel_simple_invokeWS");
+
+ result = processResult(result);
+
+ assertMessageFromFile(result, "hello_response1.xml");
+ }
+}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,50 +0,0 @@
-/*
- * 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 QuickstartESBBPELHelloWorldExtendedTimeoutTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world_extended_timeout";
-
- public QuickstartESBBPELHelloWorldExtendedTimeoutTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldExtendedTimeoutTestCase.class,
- TEST_NAME, "Quickstart_esb_bpel_hello_world_extended_timeout.esb,../Quickstart_bpel_hello_world_extended_timeout/Quickstart_bpel_hello_world_extended_timeout-1.jar"));
- }
-
- public void testSendHello() throws Exception {
- String result=sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello", 180000);
-
- assertMessage(result, "Hello World via ESB to BPEL World");
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,55 +0,0 @@
-/*
- * 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_no_extended_timeout sample.
- */
-public class QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world_no_extended_timeout";
-
- public QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase.class,
- TEST_NAME, "Quickstart_esb_bpel_hello_world_no_extended_timeout.esb,../Quickstart_bpel_hello_world_extended_timeout/Quickstart_bpel_hello_world_extended_timeout-1.jar"));
- }
-
- public void testSendHello() throws Exception {
-
- try {
- sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello", 180000);
-
- fail("Should have timed out due to default timeout period on BPEL process");
- } catch(Exception e) {
- // Ignore - should fail due to timeout
- }
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,50 +0,0 @@
-/*
- * 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 sample.
- */
-public class QuickstartESBBPELHelloWorldTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_esb_bpel_hello_world";
-
- public QuickstartESBBPELHelloWorldTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartESBBPELHelloWorldTestCase.class,
- TEST_NAME, "Quickstart_esb_bpel_hello_world.esb,../Quickstart_bpel_hello_world/Quickstart_bpel_hello_world-1.jar"));
- }
-
- public void testSendHello() throws Exception {
- String result=sendESBMessage("Hello World via ESB to BPEL", "HelloWorldBPELESB", "SayHello");
-
- assertMessage(result, "Hello World via ESB to BPEL World");
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanApprovalTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanApprovalTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanApprovalTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,53 +0,0 @@
-/*
- * 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_loan_approval sample from an ESB service.
- */
-public class QuickstartESBBPELLoanApprovalTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_esb_bpel_loan_approval";
-
- public QuickstartESBBPELLoanApprovalTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartESBBPELLoanApprovalTestCase.class,
- TEST_NAME, "Quickstart_esb_bpel_loan_approval.esb,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval-1.jar,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval.war"));
- }
-
- public void testSendHello() throws Exception {
- String result=sendESBMessage("<request><firstName>Fred</firstName><name>Bloggs</name><amount>1000</amount></request>",
- "LoanApprovalBPELESB", "LoanApproval");
-
- if (result == null || result.contains("<accept>yes</accept>") == false) {
- fail("Invalid result");
- }
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,87 +0,0 @@
-/*
- * 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_loan_fault sample.
- */
-public class QuickstartESBBPELLoanFaultTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_esb_bpel_loan_fault";
- protected static final String BODY_FAULT_CODE = "org.jboss.soa.esb.message.fault.detail.code";
- protected static final String BODY_BPEL_FAULT_CODE = "org.jboss.soa.bpel.message.fault.detail.code";
- protected static final String BODY_FAULT_MESSAGE = "org.jboss.soa.esb.message.fault.detail.detail";
-
- public QuickstartESBBPELLoanFaultTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartESBBPELLoanFaultTestCase.class,
- TEST_NAME, "Quickstart_esb_bpel_loan_fault.esb,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval-1.jar,../Quickstart_bpel_loan_approval/Quickstart_bpel_loan_approval.war"));
- }
-
- public void testSendLoanRequestZeroAmountException() throws Exception {
- try {
- String result=sendESBMessage("<request><firstName>Jane</firstName><name>Bloggs</name><amount>0</amount></request>",
- "LoanFaultBPELESB", "LoanFailException");
-
- fail("Test should have failed with FaultMessageException");
-
- } catch(org.jboss.soa.esb.couriers.FaultMessageException fme) {
-
- assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_FAULT_MESSAGE),
- "<message><errorCode><integer xmlns=\"http://example.com/loan-approval/xsd/error-messages/\">1</integer></errorCode></message>");
-
- assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_BPEL_FAULT_CODE),
- "{http://example.com/loan-approval/wsdl/}unableToHandleRequest");
-
- } catch(Exception e) {
- fail("Test failed with exception: "+e);
- }
- }
-
- public void testSendLoanRequestZeroAmountFaultMessage() throws Exception {
- try {
- String result=sendESBMessage("<request><firstName>Jane</firstName><name>Bloggs</name><amount>0</amount></request>",
- "LoanFaultBPELESB", "LoanFailMessage");
-
- fail("Test should have failed with FaultMessageException");
-
- } catch(org.jboss.soa.esb.couriers.FaultMessageException fme) {
-
- assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_FAULT_MESSAGE),
- "<message><errorCode><integer xmlns=\"http://example.com/loan-approval/xsd/error-messages/\">1</integer></errorCode></message>");
-
- assertMessage((String)fme.getReturnedMessage().getBody().get(BODY_BPEL_FAULT_CODE),
- "{http://example.com/loan-approval/wsdl/}unableToHandleRequest");
-
- } catch(Exception e) {
- fail("Test failed with exception: "+e);
- }
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,57 +0,0 @@
-/*
- * 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 ESB simple_esb_proxy_invoke sample.
- */
-public class QuickstartSimpleESBProxyInvoke2TestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_simple_esb_proxy_invoke2";
-
- public QuickstartSimpleESBProxyInvoke2TestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- if (System.getProperty("ws.stack","native").equals("native")) {
- return(new RiftSawTestSetup(QuickstartSimpleESBProxyInvoke2TestCase.class,
- TEST_NAME, "Quickstart_simple_esb_proxy_invoke2-1.jar,Quickstart_simple_esb_proxy_invoke2.war,Quickstart_simple_esb_proxy_invoke2-service.esb"));
- } else {
- return(new junit.framework.TestSuite());
- }
- }
-
- public void testSendHello() throws Exception {
- String result=sendSOAPMessage("hello_request1.xml",
- "http://localhost:8080/Quickstart_bpel_simple_invokeWS");
-
- result = processResult(result);
-
- assertMessageFromFile(result, "hello_response1.xml");
- }
-}
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-10-06 14:38:10 UTC (rev 1022)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-10-06 18:42:15 UTC (rev 1023)
@@ -1,57 +0,0 @@
-/*
- * 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 ESB simple_esb_proxy_invoke sample.
- */
-public class QuickstartSimpleESBProxyInvokeTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_simple_esb_proxy_invoke";
-
- public QuickstartSimpleESBProxyInvokeTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- if (System.getProperty("ws.stack","native").equals("native")) {
- return(new RiftSawTestSetup(QuickstartSimpleESBProxyInvokeTestCase.class,
- TEST_NAME, "Quickstart_simple_esb_proxy_invoke-1.jar,Quickstart_simple_esb_proxy_invoke.war,Quickstart_simple_esb_proxy_invoke.esb"));
- } else {
- return(new junit.framework.TestSuite());
- }
- }
-
- public void testSendHello() throws Exception {
- String result=sendSOAPMessage("hello_request1.xml",
- "http://localhost:8080/Quickstart_bpel_simple_invokeWS");
-
- result = processResult(result);
-
- assertMessageFromFile(result, "hello_response1.xml");
- }
-}
15 years
riftsaw SVN: r1022 - branches/RiftSaw-2.1.x/distribution/src/main/release/install.
by riftsaw-commits@lists.jboss.org
Author: kurt.stam(a)jboss.com
Date: 2010-10-06 10:38:10 -0400 (Wed, 06 Oct 2010)
New Revision: 1022
Modified:
branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
Log:
RIFTSAW-298, turn off force seeding on every startup
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-06 14:35:52 UTC (rev 1021)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-06 14:38:10 UTC (rev 1022)
@@ -265,10 +265,6 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.lookup=false"
value="bpel.uddi.lookup=true"/>
- <replace file="${deploy.dir}/jbossesb-registry.sar/esb.juddi.xml">
- <replacetoken><![CDATA[juddi.seed.always">false]]></replacetoken>
- <replacevalue><![CDATA[juddi.seed.always">true]]></replacevalue>
- </replace>
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.clerk.manager=esb-registry"
value="bpel.uddi.clerk.manager=esb-registry"/>
15 years
riftsaw SVN: r1021 - trunk/distribution/src/main/release/install.
by riftsaw-commits@lists.jboss.org
Author: kurt.stam(a)jboss.com
Date: 2010-10-06 10:35:52 -0400 (Wed, 06 Oct 2010)
New Revision: 1021
Modified:
trunk/distribution/src/main/release/install/build.xml
Log:
RIFTSAW-298, turn off force seeding on every startup
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-10-06 13:59:00 UTC (rev 1020)
+++ trunk/distribution/src/main/release/install/build.xml 2010-10-06 14:35:52 UTC (rev 1021)
@@ -286,10 +286,6 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.lookup=false"
value="bpel.uddi.lookup=true"/>
- <replace file="${deploy.dir}/jbossesb-registry.sar/esb.juddi.xml">
- <replacetoken><![CDATA[juddi.seed.always">false]]></replacetoken>
- <replacevalue><![CDATA[juddi.seed.always">true]]></replacevalue>
- </replace>
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.clerk.manager=esb-registry"
value="bpel.uddi.clerk.manager=esb-registry"/>
15 years
riftsaw SVN: r1020 - trunk/distribution/src/main/release/bin.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-10-06 09:59:00 -0400 (Wed, 06 Oct 2010)
New Revision: 1020
Modified:
trunk/distribution/src/main/release/bin/bpelc.bat
trunk/distribution/src/main/release/bin/sendsoap.bat
Log:
RIFTSAW-261 - sort out the remaining task of getting the windows scripts to work with the reduced set of distributed libs.
Modified: trunk/distribution/src/main/release/bin/bpelc.bat
===================================================================
--- trunk/distribution/src/main/release/bin/bpelc.bat 2010-10-05 17:31:18 UTC (rev 1019)
+++ trunk/distribution/src/main/release/bin/bpelc.bat 2010-10-06 13:59:00 UTC (rev 1020)
@@ -28,13 +28,23 @@
set ODE_LIB=%~dp0..\lib
set ODE_ETC=%~dp0..\etc
+if "%JBOSS_HOME%"=="" goto noJBossHome
+
+set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib
+set LIB2=%ODE_HOME%/lib
+set LIB3=%JBOSS_HOME%/client
+
if "%JAVA_HOME%"=="" goto noJavaHome
if not exist "%JAVA_HOME%"\bin\java.exe goto noJava
set JAVACMD="%JAVA_HOME%\bin\java.exe"
set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB%
-FOR %%c in (%ODE_LIB%\*.jar) DO (call :append_cp %%c)
+FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c)
+FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c)
+rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c)
+call :append_cp %LIB3%\log4j.jar
+call :append_cp %LIB3%\commons-logging.jar
%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.bpelc.cline.BpelC %*
goto end
@@ -56,6 +66,10 @@
echo ERROR: JAVA_HOME not set! Aborting.
goto end
+:noJBossHome
+echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation.
+goto end
+
:noJava
echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting
goto end
Modified: trunk/distribution/src/main/release/bin/sendsoap.bat
===================================================================
--- trunk/distribution/src/main/release/bin/sendsoap.bat 2010-10-05 17:31:18 UTC (rev 1019)
+++ trunk/distribution/src/main/release/bin/sendsoap.bat 2010-10-06 13:59:00 UTC (rev 1020)
@@ -28,13 +28,22 @@
set ODE_LIB=%~dp0..\lib
set ODE_ETC=%~dp0..\etc
+if "%JBOSS_HOME%"=="" goto noJBossHome
+
+set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib
+set LIB2=%ODE_HOME%/lib
+set LIB3=%JBOSS_HOME%/client
+
if "%JAVA_HOME%"=="" goto noJavaHome
if not exist "%JAVA_HOME%"\bin\java.exe goto noJava
set JAVACMD="%JAVA_HOME%\bin\java.exe"
set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB%
-FOR %%c in (%ODE_LIB%\*.jar) DO (call :append_cp %%c)
+FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c)
+FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c)
+rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c)
+call :append_cp %LIB3%\log4j.jar
%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.sendsoap.cline.HttpSoapSender %*
goto end
@@ -56,6 +65,10 @@
echo ERROR: JAVA_HOME not set! Aborting.
goto end
+:noJBossHome
+echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation.
+goto end
+
:noJava
echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting
goto end
15 years
Build failed in Hudson: RiftSaw-2.1.x #70
by jboss-qa-internal@redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-2.1.x/70/>
------------------------------------------
Started by user admin
Building remotely on dev09
Checking out a fresh workspace because there's no workspace at /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Checking out a fresh workspace because /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw doesn't exist
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Checking out a fresh workspace because /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw doesn't exist
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Checking out a fresh workspace because /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw doesn't exist
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Checking out a fresh workspace because /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw doesn't exist
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Retrying after 10 seconds
Checking out a fresh workspace because /qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw doesn't exist
Checking out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
ERROR: Failed to check out http://anonsvn.jboss.org/repos/riftsaw/branches/RiftSaw-2.1.x
org.tmatesoft.svn.core.SVNException: svn: Cannot create new file '/qa/services/hudson/hudson_workspace/workspace/RiftSaw-2.1.x/riftsaw/.svn/lock': Permission denied
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNFileUtil.createEmptyFile(SVNFileUtil.java:293)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.createVersionedDirectory(SVNAdminArea14.java:1577)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14Factory.doCreateVersionedDirectory(SVNAdminArea14Factory.java:39)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:228)
at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory.createVersionedDirectory(SVNAdminAreaFactory.java:235)
at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:913)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:742)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Recording test results
Archiving artifacts
15 years
riftsaw SVN: r1019 - in branches/RiftSaw-2.1.x: distribution/src/main/assembly and 3 other directories.
by riftsaw-commits@lists.jboss.org
Author: kurt.stam(a)jboss.com
Date: 2010-10-05 13:31:18 -0400 (Tue, 05 Oct 2010)
New Revision: 1019
Modified:
branches/RiftSaw-2.1.x/distribution/pom.xml
branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml
branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
branches/RiftSaw-2.1.x/runtime/uddi/pom.xml
branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
RIFTSAW-280, also applying revision 1018 to this 2.1.x branch
Modified: branches/RiftSaw-2.1.x/distribution/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/pom.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -205,6 +205,12 @@
<version>1.0</version>
</dependency>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>3.0.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
Modified: branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -207,6 +207,13 @@
</includes>
</dependencySet>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependencySet>
+ <outputDirectory>/db/juddi</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddi-client</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -275,6 +275,14 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"
value="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"/>
+
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true">
+ <fileset dir="../db/juddi">
+ <include name="juddi-client-*.jar"/>
+ </fileset>
+ </copy>
+
</target>
<target name="renameEsbJUDDIClientXML" if="isNot.renamedToOld" depends="check.esb.juddi.client.xml.old">
Modified: branches/RiftSaw-2.1.x/runtime/uddi/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/uddi/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/runtime/uddi/pom.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -25,7 +25,7 @@
<dependency>
<artifactId>juddi-client</artifactId>
<groupId>org.apache.juddi</groupId>
- <version>3.0.3</version>
+ <version>3.0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-10-05 17:31:18 UTC (rev 1019)
@@ -204,15 +204,25 @@
bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + bindingName, properties);
}
bindingKey = bindingKey.toLowerCase();
- //Lookup the binding
- BindingTemplate binding = null;
- try {
- binding = bpelClerk.findServiceBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
- //TODO Kurt: Just delete this binding -not all bindings- upgrade the jUDDI client to support this.
- BusinessService businessService = bpelClerk.findService(binding.getServiceKey(), bpelClerk.getUDDINode().getApiNode());
- bpelClerk.unRegister(businessService, bpelClerk.getUDDINode().getApiNode());
+ try {
+ boolean isRemoveServiceIfNoTemplates = true; //we can make this configurable if needed.
+ if (isRemoveServiceIfNoTemplates) {
+ BindingTemplate bindingTemplate = bpelClerk.findServiceBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ BusinessService businessService = bpelClerk.findService(bindingTemplate.getServiceKey(), bpelClerk.getUDDINode().getApiNode());
+ if (businessService.getBindingTemplates().getBindingTemplate().size()==1 &&
+ businessService.getBindingTemplates().getBindingTemplate().get(0).getBindingKey().equals(bindingKey)) {
+ log.info("info removing service " + businessService.getServiceKey() + "from UDDI.");
+ bpelClerk.unRegisterService(businessService.getServiceKey(),bpelClerk.getUDDINode().getApiNode());
+ } else {
+ log.info("info removing binding " + bindingKey + "from UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
+ } else {
+ log.info("info removing binding " + bindingKey + "from UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
} catch (Exception e) {
- log.warn("Could not find BindingTemplate with key " + bindingKey + " for unRegistration.");
+ log.warn("Could not unRegister BindingTemplate with key " + bindingKey);
}
} catch (Exception e) {
log.error("Unable to unRegister EPR " + bindingName
15 years
riftsaw SVN: r1018 - in trunk: distribution/src/main/assembly and 3 other directories.
by riftsaw-commits@lists.jboss.org
Author: kurt.stam(a)jboss.com
Date: 2010-10-05 11:44:31 -0400 (Tue, 05 Oct 2010)
New Revision: 1018
Modified:
trunk/distribution/pom.xml
trunk/distribution/src/main/assembly/bin.xml
trunk/distribution/src/main/release/install/build.xml
trunk/runtime/uddi/pom.xml
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
RIFTSAW-280, now removing the service if the last bindingtemplate is removed.
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2010-10-05 14:56:46 UTC (rev 1017)
+++ trunk/distribution/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
@@ -222,6 +222,12 @@
<version>1.0</version>
</dependency>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>3.0.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2010-10-05 14:56:46 UTC (rev 1017)
+++ trunk/distribution/src/main/assembly/bin.xml 2010-10-05 15:44:31 UTC (rev 1018)
@@ -202,6 +202,13 @@
</includes>
</dependencySet>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependencySet>
+ <outputDirectory>/db/juddi</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddi-client</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-10-05 14:56:46 UTC (rev 1017)
+++ trunk/distribution/src/main/release/install/build.xml 2010-10-05 15:44:31 UTC (rev 1018)
@@ -296,6 +296,14 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"
value="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"/>
+
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true">
+ <fileset dir="../db/juddi">
+ <include name="juddi-client-*.jar"/>
+ </fileset>
+ </copy>
+
</target>
<target name="renameEsbJUDDIClientXML" if="isNot.renamedToOld" depends="check.esb.juddi.client.xml.old">
Modified: trunk/runtime/uddi/pom.xml
===================================================================
--- trunk/runtime/uddi/pom.xml 2010-10-05 14:56:46 UTC (rev 1017)
+++ trunk/runtime/uddi/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
@@ -26,7 +26,7 @@
<dependency>
<artifactId>juddi-client</artifactId>
<groupId>org.apache.juddi</groupId>
- <version>3.0.3</version>
+ <version>3.0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-10-05 14:56:46 UTC (rev 1017)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-10-05 15:44:31 UTC (rev 1018)
@@ -207,15 +207,25 @@
bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + bindingName, properties);
}
bindingKey = bindingKey.toLowerCase();
- //Lookup the binding
- BindingTemplate binding = null;
- try {
- binding = bpelClerk.findServiceBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
- //TODO Kurt: Just delete this binding -not all bindings- upgrade the jUDDI client to support this.
- BusinessService businessService = bpelClerk.findService(binding.getServiceKey(), bpelClerk.getUDDINode().getApiNode());
- bpelClerk.unRegister(businessService, bpelClerk.getUDDINode().getApiNode());
+ try {
+ boolean isRemoveServiceIfNoTemplates = true; //we can make this configurable if needed.
+ if (isRemoveServiceIfNoTemplates) {
+ BindingTemplate bindingTemplate = bpelClerk.findServiceBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ BusinessService businessService = bpelClerk.findService(bindingTemplate.getServiceKey(), bpelClerk.getUDDINode().getApiNode());
+ if (businessService.getBindingTemplates().getBindingTemplate().size()==1 &&
+ businessService.getBindingTemplates().getBindingTemplate().get(0).getBindingKey().equals(bindingKey)) {
+ log.info("info removing service " + businessService.getServiceKey() + "from UDDI.");
+ bpelClerk.unRegisterService(businessService.getServiceKey(),bpelClerk.getUDDINode().getApiNode());
+ } else {
+ log.info("info removing binding " + bindingKey + "from UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
+ } else {
+ log.info("info removing binding " + bindingKey + "from UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
} catch (Exception e) {
- log.warn("Could not find BindingTemplate with key " + bindingKey + " for unRegistration.");
+ log.warn("Could not unRegister BindingTemplate with key " + bindingKey);
}
} catch (Exception e) {
log.error("Unable to unRegister EPR " + bindingName
15 years
riftsaw SVN: r1017 - in branches: RiftSaw-2.1.x/integration-tests and 6 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-10-05 10:56:46 -0400 (Tue, 05 Oct 2010)
New Revision: 1017
Added:
branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml
Modified:
branches/RiftSaw-2.1.x/integration-tests/build.xml
branches/RiftSaw-2.1.x/pom.xml
branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
Log:
RIFTSAW-296 - ODE could not cope with a BPEL process providing a WSDL service with multiple ports.
Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-10-05 13:38:58 UTC (rev 1016)
+++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -171,6 +171,7 @@
<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_296/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint1/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint2/build.xml" />
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.bpel 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/HelloGoodbye.wsdl 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/bpel/deploy.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/build.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_request1.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/goodbye_response1.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -0,0 +1,3 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><odens:goodbyeResponse 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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_request1.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/testcases/RiftSaw_296/messages/hello_response1.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -0,0 +1,3 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><odens:helloResponse 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
Modified: branches/RiftSaw-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/pom.xml 2010-10-05 13:38:58 UTC (rev 1016)
+++ branches/RiftSaw-2.1.x/pom.xml 2010-10-05 14:56:46 UTC (rev 1017)
@@ -72,7 +72,7 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.1.3.Final</riftsaw.ode.version>
+ <riftsaw.ode.version>2.1.4-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.1.2-SNAPSHOT</riftsaw.engine.version>
<bpel.console.version>2.1.2</bpel.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
Modified: branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-10-05 13:38:58 UTC (rev 1016)
+++ branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2010-10-05 14:56:46 UTC (rev 1017)
@@ -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);
+ if (operation == null) {
+ throw new BpelEngineException("Operation[" + mex.getOperationName() + "] could not be found on the portType [" + portType.getQName() + "]");
+ }
} else {
__log.warn("Couldn't find endpoint from service " + mex.getServiceName() + " when initializing a myRole mex.");
}
Modified: branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2010-10-05 13:38:58 UTC (rev 1016)
+++ branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2010-10-05 14:56:46 UTC (rev 1017)
@@ -283,7 +283,7 @@
: MessageExchange.MessageExchangePattern.REQUEST_RESPONSE);
}
- private Operation getMyRoleOperation(String operationName) {
+ public Operation getMyRoleOperation(String operationName) {
return _plinkDef.getMyRoleOperation(operationName);
}
15 years