From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:26:33 +0000 Subject: Moving 1.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68 --- .../1.5.1-RC1/itest/domainmgr/basic/client/pom.xml | 48 +++ .../src/main/java/scatours/client/TestClient.java | 47 +++ .../main/resources/META-INF/sca-contribution.xml | 25 ++ .../client/src/main/resources/client.composite | 29 ++ .../tags/1.5.1-RC1/itest/domainmgr/basic/pom.xml | 42 +++ .../itest/domainmgr/basic/runtest/pom.xml | 104 ++++++ .../java/domainmgr/DomainManagerBasicTestCase.java | 345 ++++++++++++++++++++ .../src/test/resources/domain/cloud.composite | 15 + .../resources/domain/cloud/ClientNode.composite | 13 + .../resources/domain/cloud/ToursNode.composite | 13 + .../resources/domain/cloud/TripsNode.composite | 13 + .../src/test/resources/domain/domain.composite | 15 + .../src/test/resources/domain/workspace.xml | 12 + .../1.5.1-RC1/itest/domainmgr/basic/tours/pom.xml | 42 +++ .../src/main/java/com/goodvaluetrips/Trips.java | 26 ++ .../main/java/com/tuscanyscatours/Bookings.java | 26 ++ .../main/java/com/tuscanyscatours/Checkout.java | 28 ++ .../java/com/tuscanyscatours/ShoppingCart.java | 40 +++ .../main/java/com/tuscanyscatours/TripBooking.java | 35 ++ .../src/main/java/com/tuscanyscatours/Updates.java | 26 ++ .../main/resources/META-INF/sca-contribution.xml | 25 ++ .../basic/tours/src/main/resources/tours.composite | 46 +++ .../1.5.1-RC1/itest/domainmgr/basic/trips/pom.xml | 42 +++ .../main/java/com/goodvaluetrips/TripProvider.java | 26 ++ .../src/main/java/com/goodvaluetrips/Trips.java | 26 ++ .../main/resources/META-INF/sca-contribution.xml | 24 ++ .../basic/trips/src/main/resources/trips.composite | 30 ++ .../itest/domainmgr/callback/client/pom.xml | 51 +++ .../src/main/java/callbackclient/MyClientImpl.java | 52 +++ .../src/main/java/callbackclient/MyService.java | 34 ++ .../java/callbackclient/MyServiceCallback.java | 30 ++ .../src/main/java/callbackclient/TestService.java | 29 ++ .../main/resources/META-INF/sca-contribution.xml | 23 ++ .../client/src/main/resources/client.composite | 29 ++ .../1.5.1-RC1/itest/domainmgr/callback/pom.xml | 41 +++ .../itest/domainmgr/callback/runtest/pom.xml | 97 ++++++ .../src/test/java/callbacktest/TestService.java | 29 ++ .../domainmgr/DomainManagerCallbackTestCase.java | 358 +++++++++++++++++++++ .../src/test/resources/domain/cloud.composite | 12 + .../resources/domain/cloud/ClientNode.composite | 13 + .../resources/domain/cloud/ServiceNode.composite | 13 + .../src/test/resources/domain/domain.composite | 12 + .../src/test/resources/domain/workspace.xml | 10 + .../itest/domainmgr/callback/service/pom.xml | 51 +++ .../src/main/java/callbackservice/MyService.java | 34 ++ .../java/callbackservice/MyServiceCallback.java | 30 ++ .../main/java/callbackservice/MyServiceImpl.java | 50 +++ .../main/resources/META-INF/sca-contribution.xml | 23 ++ .../service/src/main/resources/service.composite | 28 ++ .../itest/domainmgr/error/payment/pom.xml | 142 ++++++++ .../payment/src/main/java/payment/PaymentImpl.java | 88 +++++ .../src/main/java/scatours/customer/Customer.java | 70 ++++ .../customer/CustomerNotFoundException.java | 58 ++++ .../java/scatours/customer/CustomerRegistry.java | 39 +++ .../scatours/customer/CustomerRegistryImpl.java | 112 +++++++ .../java/scatours/emailgateway/EmailGateway.java | 30 ++ .../scatours/emailgateway/EmailGatewayImpl.java | 35 ++ .../src/main/resources/CreditCardPayment.wsdl | 132 ++++++++ .../main/resources/META-INF/sca-contribution.xml | 24 ++ .../error/payment/src/main/resources/Payment.wsdl | 83 +++++ .../payment/src/main/resources/payment.composite | 47 +++ .../tags/1.5.1-RC1/itest/domainmgr/error/pom.xml | 40 +++ .../itest/domainmgr/error/runtest/pom.xml | 104 ++++++ .../java/domainmgr/DomainManagerErrorTestCase.java | 342 ++++++++++++++++++++ .../src/test/resources/domain/cloud.composite | 9 + .../resources/domain/cloud/PaymentNode.composite | 13 + .../src/test/resources/domain/domain.composite | 9 + .../src/test/resources/domain/workspace.xml | 8 + .../tags/1.5.1-RC1/itest/domainmgr/pom.xml | 44 +++ .../itest/domainmgr/transaction/payment/pom.xml | 142 ++++++++ .../payment/src/main/java/payment/PaymentImpl.java | 88 +++++ .../src/main/java/scatours/customer/Customer.java | 70 ++++ .../customer/CustomerNotFoundException.java | 58 ++++ .../java/scatours/customer/CustomerRegistry.java | 39 +++ .../scatours/customer/CustomerRegistryImpl.java | 112 +++++++ .../java/scatours/emailgateway/EmailGateway.java | 30 ++ .../scatours/emailgateway/EmailGatewayImpl.java | 35 ++ .../src/main/resources/CreditCardPayment.wsdl | 132 ++++++++ .../main/resources/META-INF/sca-contribution.xml | 24 ++ .../payment/src/main/resources/Payment.wsdl | 83 +++++ .../payment/src/main/resources/definitions.xml | 35 ++ .../payment/src/main/resources/payment.composite | 47 +++ .../1.5.1-RC1/itest/domainmgr/transaction/pom.xml | 40 +++ .../itest/domainmgr/transaction/runtest/pom.xml | 104 ++++++ .../DomainManagerTransactionTestCase.java | 328 +++++++++++++++++++ .../src/test/resources/domain/cloud.composite | 9 + .../resources/domain/cloud/PaymentNode.composite | 13 + .../src/test/resources/domain/domain.composite | 9 + .../src/test/resources/domain/workspace.xml | 8 + 89 files changed, 5047 insertions(+) create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/client.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/tours.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/trips.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/client.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/service.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/payment.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/pom.xml create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite create mode 100644 sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml (limited to 'sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr') diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/pom.xml new file mode 100644 index 0000000000..8c00b6ec06 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-basic + 1.5.1 + ../pom.xml + + itest-domainmgr-basic-client + Apache Tuscany SCA iTest Domain Manager Basic Client Contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + org.apache.tuscany.sca + itest-domainmgr-basic-tours + 1.5.1 + + + + + ${artifactId} + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java new file mode 100644 index 0000000000..64a1487f72 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java @@ -0,0 +1,47 @@ +/* + * 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. + */ + +package scatours.client; + +import java.math.BigDecimal; + +import com.tuscanyscatours.Bookings; +import com.tuscanyscatours.Checkout; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +@Service(Runnable.class) +public class TestClient { + @Reference + protected Bookings bookings; + + @Reference + protected Checkout checkout; + + public TestClient() { + } + + public void run() { + String bookingCode = bookings.newBooking("FS1APR4", 1); + System.out.println("Booking code is " + bookingCode); + + checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10"); + } +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..0e2af2345d --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/client.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/client.composite new file mode 100644 index 0000000000..05c2755114 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/client/src/main/resources/client.composite @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/pom.xml new file mode 100644 index 0000000000..c11131edbe --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + 1.5.1 + ../pom.xml + + itest-domainmgr-basic + Apache Tuscany SCA iTest Domain Manager Basic + + pom + + install + + + trips + tours + client + runtest + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/pom.xml new file mode 100644 index 0000000000..593c13fef4 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-basic + 1.5.1 + ../pom.xml + + itest-domainmgr-basic-runtest + Apache Tuscany SCA iTest Domain Manager Basic Run Test + + + + org.apache.tuscany.sca + itest-domainmgr-basic-trips + 1.5.1 + provided + + + + org.apache.tuscany.sca + itest-domainmgr-basic-tours + 1.5.1 + provided + + + + org.apache.tuscany.sca + itest-domainmgr-basic-client + 1.5.1 + provided + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-domain-manager + 1.5.1 + test + + + + org.apache.tuscany.sca + tuscany-binding-sca-axis2 + 1.5.1 + test + + + + junit + junit + 4.5 + test + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3.1 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + true + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java new file mode 100644 index 0000000000..46e5ab03af --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java @@ -0,0 +1,345 @@ +/* + * 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. + */ +package domainmgr; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; +import org.junit.Test; + +/** + * Starts the Romain Manager with a test configuration, then starts + * a test node that reads a deployed composite. The domain manager + * should read and configure the composite and send it to the node + * without detecting or reporting any errors. + */ +public class DomainManagerBasicTestCase { + + private String home = System.getProperty("java.home"); + private String classpath = System.getProperty("java.class.path"); + //private Runtime runtime = Runtime.getRuntime(); + private BufferedReader domainErrReader; + private BufferedReader domainOutReader; + + @Test + public void test() throws Exception { + + Process domainMgr = null; + TestNode tripsNode = null; + TestNode toursNode = null; + + try { + // Start the domain manager process in its own working directory of + // "target/test-classes/domain/" to ensure no interference with the + // node processes. The predefined domain config is copied by mvn + // from the "src/test/resources/domain/" directory. + System.out.println("Starting domain manager"); + String[] domainCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; + String userdir = System.getProperty("user.dir"); + domainMgr = Runtime.getRuntime().exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the domain manager process. + InputStream domainErr = domainMgr.getErrorStream(); + domainErrReader = new BufferedReader(new InputStreamReader(domainErr)); + InputStream domainOut = domainMgr.getInputStream(); + domainOutReader = new BufferedReader(new InputStreamReader(domainOut)); + OutputStream domainIn = domainMgr.getOutputStream(); + + // Read startup log output from the domain manager process. The log + // output is written to the process's stderr. + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // domain manager started successfully + System.out.println("Domain manager started successfully"); + break; + } + } + checkDomainOut(); + + // Start the test nodes. Each node runs in its own "target" directory + // to ensure no interference with other processes. + tripsNode = new TestNode("TripsNode", userdir + "/../trips/target/"); + tripsNode.start(); + toursNode = new TestNode("ToursNode", userdir + "/../tours/target/"); + toursNode.start(); + + // Start the client node. This runs in the current process so that + // we can use the SCAClient API to invoke its services. The current + // working directory is "runtest" which means there is no interference + // other processes. + SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode"); + checkDomainErr(); + checkDomainOut(); + clientNode.start(); + + // Run the client test code. + Runnable client = ((SCAClient)clientNode).getService(Runnable.class, "TestClient/Runnable"); + client.run(); + tripsNode.checkNodeErr(); + tripsNode.checkNodeOut(); + toursNode.checkNodeErr(); + toursNode.checkNodeOut(); + + // Stop the client node. + clientNode.stop(); + + // Stop the test nodes. + toursNode.stopNode(); + tripsNode.stopNode(); + + // Stop the domain manager by sending 'q' to stdin. + System.out.println("Stopping domain manager"); + domainIn.write('q'); + domainIn.flush(); + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: SCA Domain Manager is now stopped.")) { + // domain manager stopped successfully + System.out.println("Domain manager stopped successfully"); + break; + } + } + checkDomainOut(); + + // Wait for domain manager process to end, and check its exit value. + int value = domainMgr.waitFor(); + if (value != 0) { + throw new IllegalStateException("Domain Manager process exit value " + value); + } + + } catch (Exception ex) { + + // Error found, so destroy the test node processes and the domain + // manager process so that the test case exits cleanly. + if (tripsNode != null) { + tripsNode.destroyNode(); + } + if (toursNode != null) { + toursNode.destroyNode(); + } + if (domainMgr != null) { + System.out.println("Destroying domain"); + try { + domainMgr.destroy(); + } catch (Exception e) { + } + } + + // Report the test error. + throw ex; + } + } + + /* + * Check stderr for the domain manager process. Called periodically + * to ensure that anything written to stderr is displayed in the test log + * and abort execution if the domain manager has logged any errors. + */ + private void checkDomainErr() throws Exception { + while (domainErrReader.ready()) { + String line = domainErrReader.readLine(); + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Domain manager reported error: " + line); + } + } + } + + /* + * Check stdout for the domain manager process. Called periodically + * to ensure that anything written to stdout is displayed in the test log. + */ + private void checkDomainOut() throws Exception { + while (domainOutReader.ready()) { + String line = domainOutReader.readLine(); + System.out.println("DomainMgr.o: " + line); + } + } + + /* + * Internal class representing a test node. + */ + private class TestNode { + + String nodeName; + String nodeDir; + BufferedReader nodeErrReader; + BufferedReader nodeOutReader; + OutputStream nodeIn; + Process nodeProcess; + + TestNode(String nodeName, String nodeDir) { + this.nodeName = nodeName; + this.nodeDir = nodeDir; + } + + /* + * Start the test node. + */ + void start() throws Exception { + System.out.println("Starting node " + nodeName); + String[] nodeCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.NodeLauncher", + "http://localhost:9990/node-config/" + nodeName}; + nodeProcess = Runtime.getRuntime().exec(nodeCommand, null, new File(nodeDir)); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the test node process. + InputStream nodeErr = nodeProcess.getErrorStream(); + nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr)); + InputStream nodeOut = nodeProcess.getInputStream(); + nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut)); + nodeIn = nodeProcess.getOutputStream(); + + // Read startup log output from the test node process. The log + // output is written to the process's stderr. + while (true) { + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // test node started successfully + System.out.println("Node " + nodeName + " started successfully"); + break; + } + } + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + } + + /* + * Check stderr for the test node process. Called periodically to + * ensure that anything written to stderr is displayed in the test log + * and abort execution if the test node has logged any errors. + */ + void checkNodeErr() throws Exception { + while (nodeErrReader.ready()) { + String line = nodeErrReader.readLine(); + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + } + } + + /* + * Check stdout for the test node process. Called periodically to + * ensure that anything written to stdout is displayed in the test log. + */ + void checkNodeOut() throws Exception { + while (nodeOutReader.ready()) { + String line = nodeOutReader.readLine(); + System.out.println(nodeName + ".o: " + line); + } + } + + /* + * Stop the test node process. + */ + void stopNode() throws Exception { + System.out.println("Stopping node " + nodeName); + nodeIn.write('q'); + nodeIn.flush(); + while (true) { + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: SCA Node is now stopped.")) { + // test node stopped successfully + System.out.println("Node " + nodeName + " stopped successfully"); + break; + } + } + checkNodeOut(); + + // Wait for test node process to end, and check its exit value. + int value = nodeProcess.waitFor(); + if (value != 0) { + throw new IllegalStateException("Node " + nodeName + " exit value " + value); + } + } + + /* + * Destroy the test node process. + */ + void destroyNode() { + if (nodeProcess != null) { + System.out.println("Destroying node " + nodeName); + try { + nodeProcess.destroy(); + } catch (Exception e) { + } + } + } + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..42109ef963 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,15 @@ + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite new file mode 100644 index 0000000000..5f5fe2fc96 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite new file mode 100644 index 0000000000..4f75d7cba2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite new file mode 100644 index 0000000000..4254b0d6fb --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..4141457795 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,15 @@ + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..075c3b8693 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/pom.xml new file mode 100644 index 0000000000..2f4fb8391e --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-basic + 1.5.1 + ../pom.xml + + itest-domainmgr-basic-tours + Apache Tuscany SCA iTest Domain Manager Basic Tours Contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + + ${artifactId} + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java new file mode 100644 index 0000000000..365a210368 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package com.goodvaluetrips; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Trips { + String checkAvailability(String trip, int people); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java new file mode 100644 index 0000000000..9d54d46bb6 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package com.tuscanyscatours; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Bookings { + String newBooking(String trip, int people); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java new file mode 100644 index 0000000000..29c84d2bc0 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java @@ -0,0 +1,28 @@ +/* + * 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. + */ +package com.tuscanyscatours; + +import java.math.BigDecimal; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Checkout { + void makePayment(BigDecimal amount, String cardInfo); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java new file mode 100644 index 0000000000..db551501e1 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java @@ -0,0 +1,40 @@ +/* + * 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. + */ +package com.tuscanyscatours; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class ShoppingCart implements Checkout, Updates { + private static List bookedTrips = new ArrayList(); + + public void makePayment(BigDecimal amount, String cardInfo) { + System.out.print("Charged $" + amount + " to card " + cardInfo + " for " + + (bookedTrips.size() > 1 ? "trips" : "trip")); + for (String trip : bookedTrips){ + System.out.print(" " + trip); + } + System.out.println(); + bookedTrips.clear(); + } + public void addTrip(String resCode) { + bookedTrips.add(resCode); + } +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java new file mode 100644 index 0000000000..e64d60545e --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java @@ -0,0 +1,35 @@ +/* + * 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. + */ +package com.tuscanyscatours; + +import org.osoa.sca.annotations.Reference; + +public class TripBooking implements Bookings { + @Reference + protected com.goodvaluetrips.Trips mytrips; + + @Reference + protected Updates cart; + + public String newBooking(String trip, int people) { + String resCode = mytrips.checkAvailability(trip, people); + cart.addTrip(resCode); + return "GV" + resCode; + } +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java new file mode 100644 index 0000000000..e33b0399cb --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package com.tuscanyscatours; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Updates { + void addTrip(String resCode); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..b6ef1acafa --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/tours.composite new file mode 100644 index 0000000000..f166a1635d --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/tours/src/main/resources/tours.composite @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/pom.xml new file mode 100644 index 0000000000..e5ec95b678 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-basic + 1.5.1 + ../pom.xml + + itest-domainmgr-basic-trips + Apache Tuscany SCA iTest Domain Manager Basic Trips Contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + + ${artifactId} + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java new file mode 100644 index 0000000000..d30046aaef --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package com.goodvaluetrips; + +public class TripProvider implements Trips { + public String checkAvailability(String trip, int people) { + // call non-SCA code to reserve trip and return booking code + return "6R98Y"; + } +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java new file mode 100644 index 0000000000..365a210368 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +package com.goodvaluetrips; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Trips { + String checkAvailability(String trip, int people); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..c42834be8a --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/trips.composite new file mode 100644 index 0000000000..ab173e5ef7 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/basic/trips/src/main/resources/trips.composite @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/pom.xml new file mode 100644 index 0000000000..986b4d1215 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.5.1 + ../pom.xml + + itest-domainmgr-callback-client + Apache Tuscany SCA iTest Domain Manager Callback Client + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + + + ${artifactId} + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java new file mode 100644 index 0000000000..9937ea0b1e --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java @@ -0,0 +1,52 @@ +/* + * 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. + */ +package callbackclient; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +/** + * Demonstrates a component-to-component callback invocation + */ +@Service(TestService.class) +public class MyClientImpl implements TestService { + + private MyService myService; + private static String result; + + @Reference + protected void setMyService(MyService myService) { + this.myService = myService; + } + + public void runTest() { + System.out.println("MyClientImpl.runTest"); + myService.someMethod("-> someMethod"); + } + + public String getResult() { + System.out.println("MyClientImpl.getResult"); + return MyClientImpl.result; + } + + public void receiveResult(String result) { + System.out.println("MyClientImpl.receiveResult: result=" + result); + MyClientImpl.result = result; + } +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java new file mode 100644 index 0000000000..f22534e531 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java @@ -0,0 +1,34 @@ +/* + * 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. + */ +package callbackclient; + +import org.osoa.sca.annotations.Callback; +import org.osoa.sca.annotations.OneWay; +import org.osoa.sca.annotations.Remotable; + +/** + * This service that will be invoked in a non-blocking fashion + */ +@Remotable +@Callback(MyServiceCallback.class) +public interface MyService { + + @OneWay + void someMethod(String arg); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java new file mode 100644 index 0000000000..412b3c7584 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package callbackclient; + +import org.osoa.sca.annotations.Remotable; + +/** + * The callback interface for {@link MyService}. + */ +@Remotable +public interface MyServiceCallback { + + void receiveResult(String result); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java new file mode 100644 index 0000000000..0ec6acf2d1 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java @@ -0,0 +1,29 @@ +/* + * 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. + */ +package callbackclient; + +/** + * Test driver interface + */ +public interface TestService { + + void runTest(); + + String getResult(); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..1c37dd00b0 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/client.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/client.composite new file mode 100644 index 0000000000..33842c3853 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/client/src/main/resources/client.composite @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/pom.xml new file mode 100644 index 0000000000..0ea0cd46c4 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + 1.5.1 + ../pom.xml + + itest-domainmgr-callback + Apache Tuscany SCA iTest Domain Manager Callback + + pom + + install + + + service + client + runtest + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/pom.xml new file mode 100644 index 0000000000..99177f8c43 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/pom.xml @@ -0,0 +1,97 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.5.1 + ../pom.xml + + itest-domainmgr-callback-runtest + Apache Tuscany SCA iTest Domain Manager Callback Run Test + + + + org.apache.tuscany.sca + itest-domainmgr-callback-service + 1.5.1 + provided + + + + org.apache.tuscany.sca + itest-domainmgr-callback-client + 1.5.1 + provided + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-domain-manager + 1.5.1 + test + + + + org.apache.tuscany.sca + tuscany-binding-sca-axis2 + 1.5.1 + test + + + + junit + junit + 4.5 + test + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3.1 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + true + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java new file mode 100644 index 0000000000..6cd580676c --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java @@ -0,0 +1,29 @@ +/* + * 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. + */ +package callbacktest; + +/** + * Test driver interface + */ +public interface TestService { + + void runTest(); + + String getResult(); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java new file mode 100644 index 0000000000..71d165449d --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java @@ -0,0 +1,358 @@ +/* + * 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. + */ +package domainmgr; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; +import org.junit.Test; +import callbacktest.TestService; + +import static org.junit.Assert.*; + +/** + * Starts the Romain Manager with a test configuration, then starts + * a test node that reads a deployed composite. The domain manager + * should read and configure the composite and send it to the node + * without detecting or reporting any errors. + */ +public class DomainManagerCallbackTestCase { + + private String home = System.getProperty("java.home"); + private String classpath = System.getProperty("java.class.path"); + private Runtime runtime = Runtime.getRuntime(); + private BufferedReader domainErrReader; + private BufferedReader domainOutReader; + + @Test + public void test() throws Exception { + + Process domainMgr = null; + TestNode otherNode = null; + + try { + // Start the domain manager process in its own working directory of + // "target/test-classes/domain/" to ensure no interference with the + // node processes. The predefined domain config is copied by mvn + // from the "src/test/resources/domain/" directory. + System.out.println("Starting domain manager"); + String[] domainCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; + String userdir = System.getProperty("user.dir"); + domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the domain manager process. + InputStream domainErr = domainMgr.getErrorStream(); + domainErrReader = new BufferedReader(new InputStreamReader(domainErr)); + InputStream domainOut = domainMgr.getInputStream(); + domainOutReader = new BufferedReader(new InputStreamReader(domainOut)); + OutputStream domainIn = domainMgr.getOutputStream(); + + // Read startup log output from the domain manager process. The log + // output is written to the process's stderr. + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // domain manager started successfully + System.out.println("Domain manager started successfully"); + break; + } + } + checkDomainOut(); + + // Start the test nodes. Each node runs in its own "target" directory + // to ensure no interference with other processes. + otherNode = new TestNode("ServiceNode", userdir + "/../service/target/"); + otherNode.start(); + + // Start the client node. This runs in the current process so that + // we can use the SCAClient API to invoke its services. The current + // working directory is "runtest" which means there is no interference + // other processes. + SCANode thisNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode"); + checkDomainErr(); + checkDomainOut(); + thisNode.start(); + + // Run the client test code. + TestService tester = ((SCAClient)thisNode).getService(TestService.class, "MyClientComponent/TestService"); + tester.runTest(); + otherNode.checkNodeErr(); + otherNode.checkNodeOut(); + System.out.println("Sleeping ..."); + Thread.sleep(4000); + otherNode.checkNodeErr(); + otherNode.checkNodeOut(); + assertEquals("-> someMethod -> receiveResult", tester.getResult()); + + // Stop the client node. + thisNode.stop(); + + // Stop the test nodes. + otherNode.stopNode(); + otherNode = null; + + // Stop the domain manager by sending 'q' to stdin. + System.out.println("Stopping domain manager"); + domainIn.write('q'); + domainIn.flush(); + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: SCA Domain Manager is now stopped.")) { + // domain manager stopped successfully + System.out.println("Domain manager stopped successfully"); + break; + } + } + checkDomainOut(); + + // Wait for domain manager process to end, and check its exit value. + int value = domainMgr.waitFor(); + if (value != 0) { + throw new IllegalStateException("Domain Manager process exit value " + value); + } + domainMgr = null; + + } finally { + // If the test nodes did not shut down cleanly, destroy the test + // node processes. + if (otherNode != null) { + otherNode.destroyNode(); + } + + // If the domain manager did not shut down cleanly, destroy the + // domain manager process. + if (domainMgr != null) { + System.out.println("Destroying domain"); + checkDomainErr(true); + checkDomainOut(); + try { + domainMgr.destroy(); + } catch (Exception e) { + } + } + } + } + + /* + * Check stderr for the domain manager process. Called periodically + * to ensure that anything written to stderr is displayed in the test log + * and abort execution if the domain manager has logged any errors. + */ + private void checkDomainErr(boolean nothrow) throws Exception { + while (domainErrReader.ready()) { + String line = domainErrReader.readLine(); + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:") && !nothrow) { + throw new IllegalStateException("Domain manager reported error: " + line); + } + } + } + + private void checkDomainErr() throws Exception { + checkDomainErr(false); + } + + /* + * Check stdout for the domain manager process. Called periodically + * to ensure that anything written to stdout is displayed in the test log. + */ + private void checkDomainOut() throws Exception { + while (domainOutReader.ready()) { + String line = domainOutReader.readLine(); + System.out.println("DomainMgr.o: " + line); + } + } + + /* + * Internal class representing a test node. + */ + private class TestNode { + + String nodeName; + String nodeDir; + BufferedReader nodeErrReader; + BufferedReader nodeOutReader; + OutputStream nodeIn; + Process nodeProcess; + + TestNode(String nodeName, String nodeDir) { + this.nodeName = nodeName; + this.nodeDir = nodeDir; + } + + /* + * Start the test node. + */ + void start() throws Exception { + System.out.println("Starting node " + nodeName); + String[] nodeCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.NodeLauncher", + "http://localhost:9990/node-config/" + nodeName}; + nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the test node process. + InputStream nodeErr = nodeProcess.getErrorStream(); + nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr)); + InputStream nodeOut = nodeProcess.getInputStream(); + nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut)); + nodeIn = nodeProcess.getOutputStream(); + + // Read startup log output from the test node process. The log + // output is written to the process's stderr. + while (true) { + Thread.sleep(100); + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // test node started successfully + System.out.println("Node " + nodeName + " started successfully"); + break; + } + } + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + } + + /* + * Check stderr for the test node process. Called periodically to + * ensure that anything written to stderr is displayed in the test log + * and abort execution if the test node has logged any errors. + */ + void checkNodeErr(boolean nothrow) throws Exception { + while (nodeErrReader.ready()) { + String line = nodeErrReader.readLine(); + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:") && !nothrow) { + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + } + } + + void checkNodeErr() throws Exception { + checkNodeErr(false); + } + + /* + * Check stdout for the test node process. Called periodically to + * ensure that anything written to stdout is displayed in the test log. + */ + void checkNodeOut() throws Exception { + while (nodeOutReader.ready()) { + String line = nodeOutReader.readLine(); + System.out.println(nodeName + ".o: " + line); + } + } + + /* + * Stop the test node process. + */ + void stopNode() throws Exception { + System.out.println("Stopping node " + nodeName); + nodeIn.write('q'); + nodeIn.flush(); + while (true) { + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: SCA Node is now stopped.")) { + // test node stopped successfully + System.out.println("Node " + nodeName + " stopped successfully"); + break; + } + } + checkNodeOut(); + + // Wait for test node process to end, and check its exit value. + int value = nodeProcess.waitFor(); + if (value != 0) { + throw new IllegalStateException("Node " + nodeName + " exit value " + value); + } + } + + /* + * Destroy the test node process. + */ + void destroyNode() throws Exception { + if (nodeProcess != null) { + System.out.println("Destroying node " + nodeName); + checkNodeErr(true); + checkNodeOut(); + try { + nodeProcess.destroy(); + } catch (Exception e) { + } + } + } + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..4b2c664ed2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,12 @@ + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite new file mode 100644 index 0000000000..509bfafac1 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite new file mode 100644 index 0000000000..1f1f0c47c2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..ba4d6bbf25 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,12 @@ + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..6a6288e39c --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/pom.xml new file mode 100644 index 0000000000..31d019010f --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-callback + 1.5.1 + ../pom.xml + + itest-domainmgr-callback-service + Apache Tuscany SCA iTest Domain Manager Callback Service + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + + + ${artifactId} + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java new file mode 100644 index 0000000000..e5fbeb48ba --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java @@ -0,0 +1,34 @@ +/* + * 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. + */ +package callbackservice; + +import org.osoa.sca.annotations.Callback; +import org.osoa.sca.annotations.OneWay; +import org.osoa.sca.annotations.Remotable; + +/** + * This service that will be invoked in a non-blocking fashion + */ +@Remotable +@Callback(MyServiceCallback.class) +public interface MyService { + + @OneWay + void someMethod(String arg); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java new file mode 100644 index 0000000000..896f6ca873 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package callbackservice; + +import org.osoa.sca.annotations.Remotable; + +/** + * The callback interface for {@link MyService}. + */ +@Remotable +public interface MyServiceCallback { + + void receiveResult(String result); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java new file mode 100644 index 0000000000..1afbbfe934 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java @@ -0,0 +1,50 @@ +/* + * 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. + */ +package callbackservice; + +import org.osoa.sca.annotations.Callback; + +/** + * This class implements MyService and uses a callback. + */ +public class MyServiceImpl implements MyService { + + private MyServiceCallback myServiceCallback; + + /** + * The setter used by the runtime to set the callback reference + * @param myServiceCallback + */ + @Callback + protected void setMyServiceCallback(MyServiceCallback myServiceCallback) { + this.myServiceCallback = myServiceCallback; + } + + public void someMethod(String arg) { + System.out.println("MyServiceImpl.someMethod"); + // invoke the callback + try { + myServiceCallback.receiveResult(arg + " -> receiveResult"); + System.out.println("MyServiceImpl.someMethod returned from receiveResult() call"); + } catch (RuntimeException e) { + System.out.println("MyServiceImpl.someMethod exception invoking receiveResult: " + e.toString()); + } + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..517d022013 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/service.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/service.composite new file mode 100644 index 0000000000..b84830795b --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/callback/service/src/main/resources/service.composite @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/pom.xml new file mode 100644 index 0000000000..70c9e9674e --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/pom.xml @@ -0,0 +1,142 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-error + 1.5.1 + ../pom.xml + + itest-domainmgr-error-payment + Apache Tuscany SCA iTest Domain Manager Error Handling Payment + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + javax.annotation + jsr250-api + 1.0 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-security + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-transaction + 1.5.1 + runtime + + + + + + ${artifactId} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-source + + + + target/jaxws-source + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + 1.12 + + + payment + generate-sources + + wsimport + + + payment + ${basedir}/src/main/resources + + Payment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/payment.stale + false + true + + + + payment.creditcard + process-sources + + wsimport + + + payment.creditcard + ${basedir}/src/main/resources + + CreditCardPayment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/creditcard.stale + false + true + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java new file mode 100644 index 0000000000..071bcf22c2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java @@ -0,0 +1,88 @@ +/* + * 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. + */ + +package payment; + +import javax.annotation.security.RolesAllowed; +import javax.annotation.security.RunAs; + +import org.osoa.sca.annotations.Authentication; +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import payment.creditcard.AuthorizeFault_Exception; +import payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardPayment; +import scatours.customer.Customer; +import scatours.customer.CustomerNotFoundException; +import scatours.customer.CustomerRegistry; +import scatours.emailgateway.EmailGateway; + +/** + * The payment implementation + */ +@Service(Payment.class) +@RolesAllowed({"Admin", "Billing"}) +@RunAs("Billing") +public class PaymentImpl implements Payment { + + @Reference + protected CustomerRegistry customerRegistry; + + @Reference + @Authentication + protected CreditCardPayment creditCardPayment; + + @Reference + protected EmailGateway emailGateway; + + @Property + protected float transactionFeeRate = 0.01f; + + public String makePaymentMember(String customerId, float amount) { + Customer customer = null; + + try { + customer = customerRegistry.getCustomer(customerId); + } catch (CustomerNotFoundException ex) { + return "Payment failed due to " + ex.getMessage(); + } catch (Throwable t) { + return "Payment failed due to system error " + t.getMessage(); + } + + CreditCardDetailsType ccDetails = customer.getCreditCard(); + + String status; + try { + status = creditCardPayment.authorize(ccDetails, amount); + } catch (AuthorizeFault_Exception e) { + status = e.getFaultInfo().getErrorCode(); + } + + StringBuffer body = new StringBuffer(); + body.append(customer); + body.append("\n").append("Status: ").append(status).append("\n"); + emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body + .toString()); + + return status; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java new file mode 100644 index 0000000000..daf56353a3 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java @@ -0,0 +1,70 @@ +/* + * 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. + */ + +package scatours.customer; + +import payment.creditcard.CreditCardDetailsType; + +/** + * Customer data + */ +public class Customer { + private String id; + private String email; + private String name; + + private CreditCardDetailsType creditCard; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public CreditCardDetailsType getCreditCard() { + return creditCard; + } + + public void setCreditCard(CreditCardDetailsType creditCard) { + this.creditCard = creditCard; + } + + public String toString() { + return "id: " + id + " name: " + name + " e-mail: " + email; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java new file mode 100644 index 0000000000..89f56ce6ec --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java @@ -0,0 +1,58 @@ +/* + * 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. + */ + +package scatours.customer; + + +public class CustomerNotFoundException extends Exception { + private static final long serialVersionUID = -129752837478357452L; + + /** + * + */ + public CustomerNotFoundException() { + + } + + /** + * @param message + */ + public CustomerNotFoundException(String message) { + super(message); + + } + + /** + * @param cause + */ + public CustomerNotFoundException(Throwable cause) { + super(cause); + + } + + /** + * @param message + * @param cause + */ + public CustomerNotFoundException(String message, Throwable cause) { + super(message, cause); + + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java new file mode 100644 index 0000000000..cfd79a7f95 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java @@ -0,0 +1,39 @@ +/* + * 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. + */ + +package scatours.customer; + +import java.util.Collection; + +import payment.creditcard.CreditCardDetailsType; + +/** + * Customer registry interface + */ +public interface CustomerRegistry { + Customer createCustomer(String name, String email, CreditCardDetailsType creditCard); + + boolean updateCustomer(Customer customer); + + Customer getCustomer(String id) throws CustomerNotFoundException; + + Collection getAllCustomers(); + + boolean deleteCustomer(String id); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java new file mode 100644 index 0000000000..e6328f062c --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java @@ -0,0 +1,112 @@ +/* + * 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. + */ + +package scatours.customer; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.EagerInit; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Requires; +import org.osoa.sca.annotations.Scope; +import org.osoa.sca.annotations.Service; + +import payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardTypeType; +import payment.creditcard.ObjectFactory; +import payment.creditcard.PayerType; + +/** + * An in-memory customer registry implementation + */ +@Service(CustomerRegistry.class) +@Scope("COMPOSITE") +@EagerInit +@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global") +public class CustomerRegistryImpl implements CustomerRegistry { + private volatile static int idGenerator = 0; + private Map customers = new HashMap(); + + @Init + public void init() { + // Load the customers + ObjectFactory factory = new ObjectFactory(); + CreditCardDetailsType cc = factory.createCreditCardDetailsType(); + PayerType john = factory.createPayerType(); + john.setName("John Smith"); + cc.setCardOwner(john); + cc.setCreditCardNumber("1111-2222-3333-4444"); + cc.setCreditCardType(CreditCardTypeType.VISA); + cc.setCVV2("1234"); + cc.setExpMonth(1); + cc.setExpYear(2012); + createCustomer("John Smith", "john@xyz.com", cc); + } + + @Destroy + public void destroy() { + // Save the customers + } + + public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) { + Customer customer = new Customer(); + customer.setId("c-" + idGenerator++); + customer.setName(name); + customer.setEmail(email); + customer.setCreditCard(creditCard); + customers.put(customer.getId(), customer); + return customer; + } + + public boolean deleteCustomer(String id) { + return customers.remove(id) != null; + } + + public Collection getAllCustomers() { + return customers.values(); + } + + public Customer getCustomer(String id) throws CustomerNotFoundException { + Customer customer = customers.get(id); + + if (customer == null){ + throw new CustomerNotFoundException("Customer " + id + " not found"); + } + + return customer; + } + + public boolean updateCustomer(Customer customer) { + Customer current = null; + try { + current = getCustomer(customer.getId()); + } catch (Exception ex) { + return false; + } + + current.setEmail(customer.getEmail()); + current.setName(customer.getName()); + current.setCreditCard(customer.getCreditCard()); + return true; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java new file mode 100644 index 0000000000..d360381327 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.emailgateway; + +import org.osoa.sca.annotations.Remotable; + +/** + * A gateway to send e-mail + */ +@Remotable +public interface EmailGateway { + public boolean sendEmail(String sender, String recipient, String subject, String body); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java new file mode 100644 index 0000000000..060c3dabda --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ + +package scatours.emailgateway; + +import org.osoa.sca.annotations.Service; + +@Service(EmailGateway.class) +public class EmailGatewayImpl implements EmailGateway { + + public boolean sendEmail(String sender, String recipient, String subject, String body) { + System.out.println("From: " + sender); + System.out.println("To: " + recipient); + System.out.println("Subject: " + subject); + System.out.println(body); + return true; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl new file mode 100644 index 0000000000..d17497d1f6 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..12b9852bf0 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl new file mode 100644 index 0000000000..3885764899 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/payment.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/payment.composite new file mode 100644 index 0000000000..53fcefc241 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/payment/src/main/resources/payment.composite @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + 0.02 + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/pom.xml new file mode 100644 index 0000000000..b783d3e73a --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + 1.5.1 + ../pom.xml + + itest-domainmgr-error + Apache Tuscany SCA iTest Domain Manager Error Handling + + pom + + install + + + payment + runtest + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/pom.xml new file mode 100644 index 0000000000..111062f0aa --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-error + 1.5.1 + ../pom.xml + + itest-domainmgr-error-runtest + Apache Tuscany SCA iTest Domain Manager Error Handling Run Test + + + + org.apache.tuscany.sca + itest-domainmgr-error-payment + 1.5.1 + provided + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-security + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-transaction + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-domain-manager + 1.5.1 + test + + + + junit + junit + 4.5 + test + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3.1 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + true + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java new file mode 100644 index 0000000000..23ffc440ab --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java @@ -0,0 +1,342 @@ +/* + * 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. + */ +package domainmgr; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; + +import org.junit.Test; + +/** + * Starts the Romain Manager with a test configuration, then starts + * a test node that reads a deployed composite. The domain manager + * should read and configure the composite and send it to the node + * without detecting or reporting any errors. + */ +public class DomainManagerErrorTestCase { + + private String home = System.getProperty("java.home"); + private String classpath = System.getProperty("java.class.path"); + private Runtime runtime = Runtime.getRuntime(); + private Process domainMgr = null; + private BufferedReader domainErrReader; + private BufferedReader domainOutReader; + private OutputStream domainIn; + + @Test + public void test() throws Exception { + + TestNode paymentNode = null; + + try { + // Start the domain manager process in its own working directory of + // "target/test-classes/domain/" to ensure no interference with the + // node processes. The predefined domain config is copied by mvn + // from the "src/test/resources/domain/" directory. + System.out.println("Starting domain manager"); + String[] domainCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; + String userdir = System.getProperty("user.dir"); + domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the domain manager process. + InputStream domainErr = domainMgr.getErrorStream(); + domainErrReader = new BufferedReader(new InputStreamReader(domainErr)); + InputStream domainOut = domainMgr.getInputStream(); + domainOutReader = new BufferedReader(new InputStreamReader(domainOut)); + domainIn = domainMgr.getOutputStream(); + + // Read startup log output from the domain manager process. The log + // output is written to the process's stderr. + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // domain manager started successfully + System.out.println("Domain manager started successfully"); + break; + } + } + checkDomainOut(); + + // Start the test nodes. Each node runs in its own "target" directory + // to ensure no interference with other processes. + paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/"); + paymentNode.start(); + + // Stop the test nodes. + paymentNode.stopNode(); + + // Stop the domain manager + stopDomain(); + + } catch (Exception ex) { + + // Error found, so destroy the test node processes and the domain + // manager process so that the test case exits cleanly. + if (paymentNode != null) { + paymentNode.destroyNode(); + } + if (domainMgr != null) { + System.out.println("Destroying domain"); + try { + domainMgr.destroy(); + } catch (Exception e) { + } + } + + // Report the test error. + throw ex; + } + } + + /* + * Stop the test node process. + */ + void stopDomain() throws Exception { + + // Stop the domain manager by sending 'q' to stdin. + System.out.println("Stopping domain manager"); + domainIn.write('q'); + domainIn.flush(); + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: SCA Domain Manager is now stopped.")) { + // domain manager stopped successfully + System.out.println("Domain manager stopped successfully"); + break; + } + } + checkDomainOut(); + + // Wait for domain manager process to end, and check its exit value. + int value = domainMgr.waitFor(); + if (value != 0) { + throw new IllegalStateException("Domain Manager process exit value " + value); + } + domainMgr = null; + } + + /* + * Check stderr for the domain manager process. Called periodically + * to ensure that anything written to stderr is displayed in the test log + * and abort execution if the domain manager has logged any errors. + */ + private void checkDomainErr() throws Exception { + while (domainErrReader.ready()) { + String line = domainErrReader.readLine(); + System.out.println("DomainMgr.e: " + line); + + // This test deliberately causes a domain manager error, so + // don't report a test failure if the expected error shows + // up in the domain manager log. + if (line.contains("SEVERE: Policy Related Exception occured due to : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) { + continue; + } + + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Domain manager reported error: " + line); + } + } + } + + /* + * Check stdout for the domain manager process. Called periodically + * to ensure that anything written to stdout is displayed in the test log. + */ + private void checkDomainOut() throws Exception { + while (domainOutReader.ready()) { + String line = domainOutReader.readLine(); + System.out.println("DomainMgr.o: " + line); + } + } + + /* + * Internal class representing a test node. + */ + private class TestNode { + + String nodeName; + String nodeDir; + BufferedReader nodeErrReader; + BufferedReader nodeOutReader; + OutputStream nodeIn; + Process nodeProcess; + + TestNode(String nodeName, String nodeDir) { + this.nodeName = nodeName; + this.nodeDir = nodeDir; + } + + /* + * Start the test node. + */ + void start() throws Exception { + System.out.println("Starting node " + nodeName); + String[] nodeCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.NodeLauncher", + "http://localhost:9990/node-config/" + nodeName}; + nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the test node process. + InputStream nodeErr = nodeProcess.getErrorStream(); + nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr)); + InputStream nodeOut = nodeProcess.getInputStream(); + nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut)); + nodeIn = nodeProcess.getOutputStream(); + + // Read startup log output from the test node process. The log + // output is written to the process's stderr. + boolean firsterror = false; + boolean seconderror = false; + try { + while (true) { + + // The domain manager may throw an exception and hang, so give it + // enough time to do this before we block on the readLine() call. + // A more robust implementation would be to read the domain manager + // output on another thread, which could interrupt the blocked + // readLine() call if the domain manager gets into trouble. + Thread.sleep(100); + checkDomainErr(); + checkDomainOut(); + + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE: HTTP Server Error : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) { + // test node received first expected error from the domain + System.out.println("Node " + nodeName + " received first expected error from domain"); + firsterror = true; + continue; + } + if (line.contains("SEVERE: ContributionReadException occured due to : java.io.IOException: Server returned HTTP response code: 500")) { + if (firsterror) { + // test node received second expected error from the domain + System.out.println("Node " + nodeName + " received second expected error from domain"); + seconderror = true; + return; + } + } + if (line.contains("SEVERE:")) { + // startup error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // test node started successfully + throw new IllegalStateException("Node " + nodeName + " did not receive expected error from domain"); + } + } + } finally { + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + } + } + + /* + * Check stderr for the test node process. Called periodically to + * ensure that anything written to stderr is displayed in the test log + * and abort execution if the test node has logged any errors. + */ + void checkNodeErr() throws Exception { + while (nodeErrReader.ready()) { + String line = nodeErrReader.readLine(); + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + } + } + + /* + * Check stdout for the test node process. Called periodically to + * ensure that anything written to stdout is displayed in the test log. + */ + void checkNodeOut() throws Exception { + while (nodeOutReader.ready()) { + String line = nodeOutReader.readLine(); + System.out.println(nodeName + ".o: " + line); + } + } + + /* + * Stop the test node process. + */ + void stopNode() throws Exception { + // The node did not start, so there is no need to send it a + // "quit" command to shut it down. We just need to make sure + // that the node process has ended cleanly. + + // Wait for test node process to end, and check its exit value. + int value = nodeProcess.waitFor(); + if (value != 1) { + throw new IllegalStateException("Node " + nodeName + " exit value " + value); + } + } + + /* + * Destroy the test node process. + */ + void destroyNode() { + if (nodeProcess != null) { + System.out.println("Destroying node " + nodeName); + try { + nodeProcess.destroy(); + } catch (Exception e) { + } + } + } + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..ca43648169 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,9 @@ + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite new file mode 100644 index 0000000000..e61fd4c1a3 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..f03181ecc5 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,9 @@ + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..9ee266671d --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/pom.xml new file mode 100644 index 0000000000..149364ae16 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/pom.xml @@ -0,0 +1,44 @@ + + + + + org.apache.tuscany.sca + tuscany-itest + 1.5.1 + ../pom.xml + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + Apache Tuscany Domain Manager Integration Tests + 1.5.1 + + pom + + install + + + basic + transaction + error + callback + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/pom.xml new file mode 100644 index 0000000000..5de1ca60a1 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/pom.xml @@ -0,0 +1,142 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-transaction + 1.5.1 + ../pom.xml + + itest-domainmgr-transaction-payment + Apache Tuscany SCA iTest Domain Manager Transaction Payment + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.5.1 + + + + javax.annotation + jsr250-api + 1.0 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-security + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-transaction + 1.5.1 + runtime + + + + + + ${artifactId} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-source + + + + target/jaxws-source + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + 1.12 + + + payment + generate-sources + + wsimport + + + payment + ${basedir}/src/main/resources + + Payment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/payment.stale + false + true + + + + payment.creditcard + process-sources + + wsimport + + + payment.creditcard + ${basedir}/src/main/resources + + CreditCardPayment.wsdl + + ${project.build.directory}/jaxws-source + ${project.build.directory}/jaxws-source/stale/creditcard.stale + false + true + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java new file mode 100644 index 0000000000..071bcf22c2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java @@ -0,0 +1,88 @@ +/* + * 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. + */ + +package payment; + +import javax.annotation.security.RolesAllowed; +import javax.annotation.security.RunAs; + +import org.osoa.sca.annotations.Authentication; +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import payment.creditcard.AuthorizeFault_Exception; +import payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardPayment; +import scatours.customer.Customer; +import scatours.customer.CustomerNotFoundException; +import scatours.customer.CustomerRegistry; +import scatours.emailgateway.EmailGateway; + +/** + * The payment implementation + */ +@Service(Payment.class) +@RolesAllowed({"Admin", "Billing"}) +@RunAs("Billing") +public class PaymentImpl implements Payment { + + @Reference + protected CustomerRegistry customerRegistry; + + @Reference + @Authentication + protected CreditCardPayment creditCardPayment; + + @Reference + protected EmailGateway emailGateway; + + @Property + protected float transactionFeeRate = 0.01f; + + public String makePaymentMember(String customerId, float amount) { + Customer customer = null; + + try { + customer = customerRegistry.getCustomer(customerId); + } catch (CustomerNotFoundException ex) { + return "Payment failed due to " + ex.getMessage(); + } catch (Throwable t) { + return "Payment failed due to system error " + t.getMessage(); + } + + CreditCardDetailsType ccDetails = customer.getCreditCard(); + + String status; + try { + status = creditCardPayment.authorize(ccDetails, amount); + } catch (AuthorizeFault_Exception e) { + status = e.getFaultInfo().getErrorCode(); + } + + StringBuffer body = new StringBuffer(); + body.append(customer); + body.append("\n").append("Status: ").append(status).append("\n"); + emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body + .toString()); + + return status; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java new file mode 100644 index 0000000000..daf56353a3 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java @@ -0,0 +1,70 @@ +/* + * 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. + */ + +package scatours.customer; + +import payment.creditcard.CreditCardDetailsType; + +/** + * Customer data + */ +public class Customer { + private String id; + private String email; + private String name; + + private CreditCardDetailsType creditCard; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public CreditCardDetailsType getCreditCard() { + return creditCard; + } + + public void setCreditCard(CreditCardDetailsType creditCard) { + this.creditCard = creditCard; + } + + public String toString() { + return "id: " + id + " name: " + name + " e-mail: " + email; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java new file mode 100644 index 0000000000..89f56ce6ec --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java @@ -0,0 +1,58 @@ +/* + * 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. + */ + +package scatours.customer; + + +public class CustomerNotFoundException extends Exception { + private static final long serialVersionUID = -129752837478357452L; + + /** + * + */ + public CustomerNotFoundException() { + + } + + /** + * @param message + */ + public CustomerNotFoundException(String message) { + super(message); + + } + + /** + * @param cause + */ + public CustomerNotFoundException(Throwable cause) { + super(cause); + + } + + /** + * @param message + * @param cause + */ + public CustomerNotFoundException(String message, Throwable cause) { + super(message, cause); + + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java new file mode 100644 index 0000000000..cfd79a7f95 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java @@ -0,0 +1,39 @@ +/* + * 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. + */ + +package scatours.customer; + +import java.util.Collection; + +import payment.creditcard.CreditCardDetailsType; + +/** + * Customer registry interface + */ +public interface CustomerRegistry { + Customer createCustomer(String name, String email, CreditCardDetailsType creditCard); + + boolean updateCustomer(Customer customer); + + Customer getCustomer(String id) throws CustomerNotFoundException; + + Collection getAllCustomers(); + + boolean deleteCustomer(String id); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java new file mode 100644 index 0000000000..e6328f062c --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java @@ -0,0 +1,112 @@ +/* + * 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. + */ + +package scatours.customer; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.EagerInit; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Requires; +import org.osoa.sca.annotations.Scope; +import org.osoa.sca.annotations.Service; + +import payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardTypeType; +import payment.creditcard.ObjectFactory; +import payment.creditcard.PayerType; + +/** + * An in-memory customer registry implementation + */ +@Service(CustomerRegistry.class) +@Scope("COMPOSITE") +@EagerInit +@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global") +public class CustomerRegistryImpl implements CustomerRegistry { + private volatile static int idGenerator = 0; + private Map customers = new HashMap(); + + @Init + public void init() { + // Load the customers + ObjectFactory factory = new ObjectFactory(); + CreditCardDetailsType cc = factory.createCreditCardDetailsType(); + PayerType john = factory.createPayerType(); + john.setName("John Smith"); + cc.setCardOwner(john); + cc.setCreditCardNumber("1111-2222-3333-4444"); + cc.setCreditCardType(CreditCardTypeType.VISA); + cc.setCVV2("1234"); + cc.setExpMonth(1); + cc.setExpYear(2012); + createCustomer("John Smith", "john@xyz.com", cc); + } + + @Destroy + public void destroy() { + // Save the customers + } + + public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) { + Customer customer = new Customer(); + customer.setId("c-" + idGenerator++); + customer.setName(name); + customer.setEmail(email); + customer.setCreditCard(creditCard); + customers.put(customer.getId(), customer); + return customer; + } + + public boolean deleteCustomer(String id) { + return customers.remove(id) != null; + } + + public Collection getAllCustomers() { + return customers.values(); + } + + public Customer getCustomer(String id) throws CustomerNotFoundException { + Customer customer = customers.get(id); + + if (customer == null){ + throw new CustomerNotFoundException("Customer " + id + " not found"); + } + + return customer; + } + + public boolean updateCustomer(Customer customer) { + Customer current = null; + try { + current = getCustomer(customer.getId()); + } catch (Exception ex) { + return false; + } + + current.setEmail(customer.getEmail()); + current.setName(customer.getName()); + current.setCreditCard(customer.getCreditCard()); + return true; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java new file mode 100644 index 0000000000..d360381327 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package scatours.emailgateway; + +import org.osoa.sca.annotations.Remotable; + +/** + * A gateway to send e-mail + */ +@Remotable +public interface EmailGateway { + public boolean sendEmail(String sender, String recipient, String subject, String body); +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java new file mode 100644 index 0000000000..060c3dabda --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java @@ -0,0 +1,35 @@ +/* + * 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. + */ + +package scatours.emailgateway; + +import org.osoa.sca.annotations.Service; + +@Service(EmailGateway.class) +public class EmailGatewayImpl implements EmailGateway { + + public boolean sendEmail(String sender, String recipient, String subject, String body) { + System.out.println("From: " + sender); + System.out.println("To: " + recipient); + System.out.println("Subject: " + subject); + System.out.println(body); + return true; + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl new file mode 100644 index 0000000000..d17497d1f6 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..12b9852bf0 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl new file mode 100644 index 0000000000..3885764899 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml new file mode 100644 index 0000000000..9060e75ed2 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite new file mode 100644 index 0000000000..53fcefc241 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + 0.02 + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/pom.xml new file mode 100644 index 0000000000..1fc0bf0cb8 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr + 1.5.1 + ../pom.xml + + itest-domainmgr-transaction + Apache Tuscany SCA iTest Domain Manager Transaction + + pom + + install + + + payment + runtest + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/pom.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/pom.xml new file mode 100644 index 0000000000..48fcf1f2fb --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-domainmgr-transaction + 1.5.1 + ../pom.xml + + itest-domainmgr-transaction-runtest + Apache Tuscany SCA iTest Domain Manager Transaction Run Test + + + + org.apache.tuscany.sca + itest-domainmgr-transaction-payment + 1.5.1 + provided + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-security + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-policy-transaction + 1.5.1 + runtime + + + + org.apache.tuscany.sca + tuscany-domain-manager + 1.5.1 + test + + + + junit + junit + 4.5 + test + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3.1 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + true + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java new file mode 100644 index 0000000000..ef99628686 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java @@ -0,0 +1,328 @@ +/* + * 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. + */ +package domainmgr; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; + +import org.junit.Test; + +/** + * Starts the Romain Manager with a test configuration, then starts + * a test node that reads a deployed composite. The domain manager + * should read and configure the composite and send it to the node + * without detecting or reporting any errors. + */ +public class DomainManagerTransactionTestCase { + + private String home = System.getProperty("java.home"); + private String classpath = System.getProperty("java.class.path"); + private Runtime runtime = Runtime.getRuntime(); + private Process domainMgr = null; + private BufferedReader domainErrReader; + private BufferedReader domainOutReader; + private OutputStream domainIn; + + @Test + public void test() throws Exception { + + TestNode paymentNode = null; + + try { + // Start the domain manager process in its own working directory of + // "target/test-classes/domain/" to ensure no interference with the + // node processes. The predefined domain config is copied by mvn + // from the "src/test/resources/domain/" directory. + System.out.println("Starting domain manager"); + String[] domainCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; + String userdir = System.getProperty("user.dir"); + domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the domain manager process. + InputStream domainErr = domainMgr.getErrorStream(); + domainErrReader = new BufferedReader(new InputStreamReader(domainErr)); + InputStream domainOut = domainMgr.getInputStream(); + domainOutReader = new BufferedReader(new InputStreamReader(domainOut)); + domainIn = domainMgr.getOutputStream(); + + // Read startup log output from the domain manager process. The log + // output is written to the process's stderr. + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // domain manager started successfully + System.out.println("Domain manager started successfully"); + break; + } + } + checkDomainOut(); + + // Start the test nodes. Each node runs in its own "target" directory + // to ensure no interference with other processes. + paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/"); + paymentNode.start(); + + // Stop the test nodes. + paymentNode.stopNode(); + + // Stop the domain manager + stopDomain(); + + } catch (Exception ex) { + + // Error found, so destroy the test node processes and the domain + // manager process so that the test case exits cleanly. + if (paymentNode != null) { + paymentNode.destroyNode(); + } + if (domainMgr != null) { + System.out.println("Destroying domain"); + try { + domainMgr.destroy(); + } catch (Exception e) { + } + } + + // Report the test error. + throw ex; + } + } + + /* + * Stop the test node process. + */ + void stopDomain() throws Exception { + + // Stop the domain manager by sending 'q' to stdin. + System.out.println("Stopping domain manager"); + domainIn.write('q'); + domainIn.flush(); + while (true) { + checkDomainOut(); + String line = domainErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping Domain Manager process"); + } + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by domain manager process + throw new IllegalStateException("Domain manager reported error: " + line); + } + if (line.contains("INFO: SCA Domain Manager is now stopped.")) { + // domain manager stopped successfully + System.out.println("Domain manager stopped successfully"); + break; + } + } + checkDomainOut(); + + // Wait for domain manager process to end, and check its exit value. + int value = domainMgr.waitFor(); + if (value != 0) { + throw new IllegalStateException("Domain Manager process exit value " + value); + } + domainMgr = null; + } + + /* + * Check stderr for the domain manager process. Called periodically + * to ensure that anything written to stderr is displayed in the test log + * and abort execution if the domain manager has logged any errors. + */ + private void checkDomainErr() throws Exception { + while (domainErrReader.ready()) { + String line = domainErrReader.readLine(); + System.out.println("DomainMgr.e: " + line); + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Domain manager reported error: " + line); + } + } + } + + /* + * Check stdout for the domain manager process. Called periodically + * to ensure that anything written to stdout is displayed in the test log. + */ + private void checkDomainOut() throws Exception { + while (domainOutReader.ready()) { + String line = domainOutReader.readLine(); + System.out.println("DomainMgr.o: " + line); + } + } + + /* + * Internal class representing a test node. + */ + private class TestNode { + + String nodeName; + String nodeDir; + BufferedReader nodeErrReader; + BufferedReader nodeOutReader; + OutputStream nodeIn; + Process nodeProcess; + + TestNode(String nodeName, String nodeDir) { + this.nodeName = nodeName; + this.nodeDir = nodeDir; + } + + /* + * Start the test node. + */ + void start() throws Exception { + System.out.println("Starting node " + nodeName); + String[] nodeCommand = { + "" + home + "/bin/java", + "-cp", + "" + classpath + "", + "org.apache.tuscany.sca.node.launcher.NodeLauncher", + "http://localhost:9990/node-config/" + nodeName}; + nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); + + // Get the new process's stdin, stdout and stderr streams so that we + // can monitor and control execution of the test node process. + InputStream nodeErr = nodeProcess.getErrorStream(); + nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr)); + InputStream nodeOut = nodeProcess.getInputStream(); + nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut)); + nodeIn = nodeProcess.getOutputStream(); + + // Read startup log output from the test node process. The log + // output is written to the process's stderr. + try { + while (true) { + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before startup completed + throw new IllegalStateException("Error starting node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // startup error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) { + // test node started successfully + System.out.println("Node " + nodeName + " started successfully"); + return; + } + } + } finally { + checkDomainErr(); + checkDomainOut(); + checkNodeOut(); + } + } + + /* + * Check stderr for the test node process. Called periodically to + * ensure that anything written to stderr is displayed in the test log + * and abort execution if the test node has logged any errors. + */ + void checkNodeErr() throws Exception { + while (nodeErrReader.ready()) { + String line = nodeErrReader.readLine(); + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + } + } + + /* + * Check stdout for the test node process. Called periodically to + * ensure that anything written to stdout is displayed in the test log. + */ + void checkNodeOut() throws Exception { + while (nodeOutReader.ready()) { + String line = nodeOutReader.readLine(); + System.out.println(nodeName + ".o: " + line); + } + } + + /* + * Stop the test node process. + */ + void stopNode() throws Exception { + System.out.println("Stopping node " + nodeName); + nodeIn.write('q'); + nodeIn.flush(); + while (true) { + checkNodeOut(); + String line = nodeErrReader.readLine(); + if (line == null) { + // reached end of stderr stream before shutdown completed + throw new IllegalStateException("Error stopping node " + nodeName); + } + System.out.println(nodeName + ".e: " + line); + if (line.contains("SEVERE:")) { + // shutdown error logged by test node process + throw new IllegalStateException("Node " + nodeName + " reported error: " + line); + } + if (line.contains("INFO: SCA Node is now stopped.")) { + // test node stopped successfully + System.out.println("Node " + nodeName + " stopped successfully"); + break; + } + } + checkNodeOut(); + + // Wait for test node process to end, and check its exit value. + int value = nodeProcess.waitFor(); + if (value != 0) { + throw new IllegalStateException("Node " + nodeName + " exit value " + value); + } + } + + /* + * Destroy the test node process. + */ + void destroyNode() { + if (nodeProcess != null) { + System.out.println("Destroying node " + nodeName); + try { + nodeProcess.destroy(); + } catch (Exception e) { + } + } + } + } + +} diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..ca43648169 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,9 @@ + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite new file mode 100644 index 0000000000..e61fd4c1a3 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..f03181ecc5 --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,9 @@ + + + + diff --git a/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..1379b37dce --- /dev/null +++ b/sca-java-1.x/tags/1.5.1-RC1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,8 @@ + + + + + -- cgit v1.2.3