diff options
Diffstat (limited to '')
28 files changed, 1540 insertions, 24 deletions
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/pom.xml b/branches/sca-java-1.x/itest/domainmgr/error/payment/pom.xml new file mode 100644 index 0000000000..70b7de4f90 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/payment/pom.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-error</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-error-payment</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Error Handling Payment</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.5.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-axis2</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-policy-security</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-policy-transaction</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/jaxws-source</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxws-maven-plugin</artifactId> + <version>1.12</version> + <executions> + <execution> + <id>payment</id> + <phase>generate-sources</phase> + <goals> + <goal>wsimport</goal> + </goals> + <configuration> + <packageName>payment</packageName> + <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> + <wsdlFiles> + <wsdlFile>Payment.wsdl</wsdlFile> + </wsdlFiles> + <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> + <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> + <verbose>false</verbose> + <xnocompile>true</xnocompile> + </configuration> + </execution> + <execution> + <id>payment.creditcard</id> + <phase>process-sources</phase> + <goals> + <goal>wsimport</goal> + </goals> + <configuration> + <packageName>payment.creditcard</packageName> + <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> + <wsdlFiles> + <wsdlFile>CreditCardPayment.wsdl</wsdlFile> + </wsdlFiles> + <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> + <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile> + <verbose>false</verbose> + <xnocompile>true</xnocompile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java new file mode 100644 index 0000000000..071bcf22c2 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java new file mode 100644 index 0000000000..daf56353a3 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java new file mode 100644 index 0000000000..89f56ce6ec --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java new file mode 100644 index 0000000000..cfd79a7f95 --- /dev/null +++ b/branches/sca-java-1.x/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<Customer> getAllCustomers();
+
+ boolean deleteCustomer(String id);
+}
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java new file mode 100644 index 0000000000..e6328f062c --- /dev/null +++ b/branches/sca-java-1.x/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<String, Customer> customers = new HashMap<String, Customer>();
+
+ @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<Customer> 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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java new file mode 100644 index 0000000000..d360381327 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java new file mode 100644 index 0000000000..060c3dabda --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl new file mode 100644 index 0000000000..d17497d1f6 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="CreditCardPayment"
+ targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+ <wsdl:types>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+ xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
+
+ <xsd:element name="authorize">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
+ <xsd:element name="Amount" type="xsd:float"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="authorizeResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="Status" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="CreditCardDetailsType">
+ <xsd:sequence>
+ <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
+ <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
+ <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
+ <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
+ <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
+ <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:simpleType name="CreditCardTypeType">
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="Visa" />
+ <xsd:enumeration value="MasterCard" />
+ <xsd:enumeration value="Discover" />
+ <xsd:enumeration value="Amex" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:complexType name="PayerType">
+ <xsd:sequence>
+ <xsd:element name="Name" type="xsd:string" />
+ <xsd:element name="Address" type="tns:AddressType" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="AddressType">
+ <xsd:sequence>
+ <xsd:element name="Street" type="xsd:string" />
+ <xsd:element name="City" type="xsd:string" />
+ <xsd:element name="State" type="xsd:string" />
+ <xsd:element name="ZipCode" type="xsd:string" />
+ <xsd:element name="HomePhone" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="authorizeFault">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="errorCode" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="AuthorizeRequest">
+ <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="AuthorizeResponse">
+ <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="AuthorizeFault">
+ <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CreditCardPayment">
+ <wsdl:operation name="authorize">
+ <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
+ <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
+ <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault> + </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="authorize">
+ <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="authorizationFailure">
+ <soap:fault name="authorizationFailure" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CreditCardPaymentService">
+ <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
+ <soap:address location="http://localhost:8080/CreditCardPayment" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="CreditCardPaymentLinkType">
+ <plnk:role name="forward" portType="tns:CreditCardPayment"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..12b9852bf0 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:scatours="http://scatours">
+ <export.java package="payment"/>
+ <deployable composite="scatours:payment" />
+</contribution>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl new file mode 100644 index 0000000000..3885764899 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="Payment"
+ targetNamespace="http://www.tuscanyscatours.com/Payment/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.tuscanyscatours.com/Payment/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+ <wsdl:types>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.tuscanyscatours.com/Payment/"
+ xmlns:tns="http://www.tuscanyscatours.com/Payment/">
+
+ <xsd:complexType name="MakePaymentMemberType">
+ <xsd:sequence>
+ <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
+ <xsd:element name="Amount" type="xsd:float"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
+
+ <xsd:complexType name="MakePaymentMemberResponseType">
+ <xsd:sequence>
+ <xsd:element name="Status" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
+
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="MakePaymentMemberRequest">
+ <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="MakePaymentMemberResponse">
+ <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Payment">
+ <wsdl:operation name="makePaymentMember">
+ <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
+ <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="PaymentBinding" type="tns:Payment">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="makePaymentMember">
+ <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="PaymentService">
+ <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
+ <soap:address location="http://localhost:8083/Payment" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="PaymentLinkType">
+ <plnk:role name="forward" portType="tns:Payment"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/payment.composite b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/payment.composite new file mode 100644 index 0000000000..53fcefc241 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/payment.composite @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://scatours"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:c="http://scatours"
+ name="payment">
+
+ <component name="PaymentComponent">
+ <implementation.java class="payment.PaymentImpl" />
+ <service name="Payment">
+ <binding.ws uri="http://localhost:8081/Payment"/>
+ </service>
+ <reference name="customerRegistry" target="CustomerRegistryComponent"/>
+ <reference name="creditCardPayment">
+ <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+ </reference>
+ <reference name="emailGateway" target="EmailGatewayComponent"/>
+ <property name="transactionFeeRate">0.02</property>
+ </component>
+
+ <component name="CustomerRegistryComponent">
+ <implementation.java class="scatours.customer.CustomerRegistryImpl" />
+ </component>
+
+ <component name="EmailGatewayComponent">
+ <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
+ </component>
+
+</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/domainmgr/error/pom.xml b/branches/sca-java-1.x/itest/domainmgr/error/pom.xml new file mode 100644 index 0000000000..2764ec29d9 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/pom.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-error</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name> + + <packaging>pom</packaging> + <build> + <defaultGoal>install</defaultGoal> + </build> + <modules> + <module>payment</module> + <module>runtest</module> + </modules> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/pom.xml b/branches/sca-java-1.x/itest/domainmgr/error/runtest/pom.xml new file mode 100644 index 0000000000..c2b3dbe6bf --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/pom.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-error</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-error-runtest</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Error Handling Run Test</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-error-payment</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-axis2</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-policy-security</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-policy-transaction</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-domain-manager</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <includes> + <include>**/*TestCase.java</include> + </includes> + <reportFormat>brief</reportFormat> + <useFile>false</useFile> + <forkMode>once</forkMode> + <argLine>-ea -Xmx256m</argLine> + <useSystemClassLoader>true</useSystemClassLoader> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java new file mode 100644 index 0000000000..b744d092c5 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java @@ -0,0 +1,344 @@ +/*
+ * 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 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/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..ca43648169 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="cloud" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:PaymentNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud" /> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite new file mode 100644 index 0000000000..e61fd4c1a3 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://scatours" + targetNamespace="http://tuscany.apache.org/cloud" + name="PaymentNode"> + <component name="PaymentNode"> + <t:implementation.node uri="scatours-payment" composite="c:payment" /> + <service name="Node"> + <binding.ws uri="http://localhost:8081" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..f03181ecc5 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="domain" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:payment" + uri="scatours-payment" + xmlns:ns2="http://scatours" /> +</composite> diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..9ee266671d --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0"> + <contribution location="file:./cloud" + uri="http://tuscany.apache.org/cloud" /> + <contribution location="file:../../../../payment/target/itest-domainmgr-error-payment.jar" + uri="scatours-payment" /> +</workspace> diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml index 4c5fa72112..b86466116f 100644 --- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml @@ -21,11 +21,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic</artifactId> + <artifactId>itest-domainmgr-transaction</artifactId> <version>1.5.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>itest-domainmgr-basic-runtest</artifactId> + <artifactId>itest-domainmgr-transaction-runtest</artifactId> <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name> <dependencies> diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java index 94e11f9590..61c30913cf 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java @@ -54,7 +54,7 @@ public class DuplicateReferenceNameTestCase extends TestCase { node.start(); calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent"); } catch (ServiceRuntimeException ex) { - if (ex.getMessage().equals("org.osoa.sca.ServiceRuntimeException: Duplicate component reference name: Component = CalculatorServiceComponent Reference = addService")){ + if (ex.getMessage().equals("org.apache.tuscany.sca.monitor.MonitorRuntimeException: Duplicate component reference name: Component = CalculatorServiceComponent Reference = addService")){ duplicateReferenceException = true; } } diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java index 60b08764c1..91c7e41e9e 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java @@ -60,7 +60,7 @@ public class XSDValidationTestCase extends TestCase { public void testCalculator() throws Exception { - assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage()); + assertEquals("org.apache.tuscany.sca.monitor.MonitorRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage()); } diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java index b8e5330007..6abc28adde 100644 --- a/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java +++ b/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.net.HttpURLConnection; import java.net.URI; import java.net.URL; import java.net.URLConnection; @@ -119,10 +120,18 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements try { URLConnection connection = url.openConnection(); connection.setUseCaches(false); - scdlStream = connection.getInputStream(); + try { + scdlStream = connection.getInputStream(); + } catch (IOException e) { + if (e.getClass() == IOException.class && connection instanceof HttpURLConnection + && ((HttpURLConnection)connection).getResponseCode() == HttpURLConnection.HTTP_INTERNAL_ERROR) { + error("HttpServerError", url, ((HttpURLConnection)connection).getResponseMessage()); + } + throw e; + } } catch (IOException e) { ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", url, ce); + error("ContributionReadException", url, e); throw ce; } return read(uri, scdlStream); @@ -161,11 +170,11 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements } } catch ( IOException e ) { ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", scdlStream, ce); + error("ContributionReadException", scdlStream, e); throw ce; } catch ( Exception e ) { ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", scdlStream, ce); + error("ContributionReadException", scdlStream, e); //throw ce; } @@ -203,7 +212,7 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements } catch (XMLStreamException e) { ContributionReadException ce = new ContributionReadException(e); - error("ContributionReadException", inputFactory, ce); + error("ContributionReadException", inputFactory, e); throw ce; } finally { try { diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/branches/sca-java-1.x/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties index f68925c6f4..f0d5b0a201 100644 --- a/branches/sca-java-1.x/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties +++ b/branches/sca-java-1.x/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties @@ -28,3 +28,4 @@ ContributionReadException = ContributionReadException occured due to : {0} ContributionResolveException = ContributionResolveException occured due to : {0} ContributionWriteException = ContributionWriteException occured due to : {0} XMLStreamException = XMLStreamException occured due to : {0} +HttpServerError = HTTP Server Error : {0} diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java index 27eb80b3ad..5de0002086 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java @@ -87,6 +87,9 @@ import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuil import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; +import org.apache.tuscany.sca.monitor.MonitorRuntimeException; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.IntentAttachPointType; import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; @@ -275,8 +278,13 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se try { String dependencyLocation = dependencyItem.getAlternate(); dependency = contribution(workspace, dependencyURI, dependencyLocation); - } catch (ContributionReadException e) { - continue; + } catch (Exception e) { + if (contributionURI.equals(dependencyURI)) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, getDescription(e)); + return; + } else { + continue; + } } workspace.getContributions().add(dependency); contributionMap.put(dependencyURI, dependency); @@ -313,9 +321,10 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se // Fuse includes into the deployable composite try { compositeIncludeBuilder.build(deployable); - } catch (CompositeBuilderException e) { - e.printStackTrace(); //[nash] - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); + analyzeProblems(); + } catch (Exception e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, getDescription(e)); + return; } // Store away the requested composite @@ -387,9 +396,9 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se contractMapper, aggregatedDefinitions, monitor); try { compositeBuilder.build(domainComposite); - } catch (CompositeBuilderException e) { - e.printStackTrace(); //[nash] - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); + analyzeProblems(); + } catch (Exception e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, getDescription(e)); return; } @@ -455,9 +464,7 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se QName formatName = new QName(format.substring(0, s), format.substring(s +1)); processor = (StAXArtifactProcessor<Composite>)staxProcessors.getProcessor(formatName); if (processor == null) { - Exception e = new IllegalArgumentException(queryString); //[nash] - e.printStackTrace(); //[nash] - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); //[nash] + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, new IllegalArgumentException(queryString).toString()); return; } } else { @@ -468,7 +475,6 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se XMLStreamWriter writer = outputFactory.createXMLStreamWriter(response.getOutputStream()); processor.write(requestedComposite, writer); } catch (Exception e) { - e.printStackTrace(); //[nash] response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); return; } @@ -541,12 +547,27 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se try { URI uri = URI.create(contributionURI); URL location = locationURL(contributionLocation); + Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location); + try { + analyzeProblems(); + } catch (ServiceRuntimeException e) { + throw e; + } catch (Exception e) { + throw new ContributionReadException(e); + } // Resolve the contribution dependencies contributionDependencyBuilder.buildContributionDependencies(contribution, workspace); contributionProcessor.resolve(contribution, workspace.getModelResolver()); + try { + analyzeProblems(); + } catch (ServiceRuntimeException e) { + throw e; + } catch (Exception e) { + throw new ContributionReadException(e); + } return contribution; } catch (ContributionReadException e) { @@ -558,6 +579,29 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se } } + private void analyzeProblems() throws Exception { + + for (Problem problem : monitor.getProblems()) { + if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) { + if (problem.getCause() != null) { + throw new ServiceRuntimeException(new MonitorRuntimeException(problem.getCause())); + } else { + throw new ServiceRuntimeException(new MonitorRuntimeException(problem.toString())); + } + } + } + } + + private String getDescription(Exception e) { + if (e instanceof ServiceRuntimeException && e.getCause() instanceof MonitorRuntimeException) { + Throwable ce = e.getCause(); + return ce.getCause() != null ? ce.getCause().toString() : ce.getMessage(); + } else { + return e.toString(); + } + } + + /** * The following code was copied from RuntimeBootStrapper to fix TUSCANY-3171 * diff --git a/branches/sca-java-1.x/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorRuntimeException.java b/branches/sca-java-1.x/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorRuntimeException.java new file mode 100644 index 0000000000..90cbe99688 --- /dev/null +++ b/branches/sca-java-1.x/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorRuntimeException.java @@ -0,0 +1,55 @@ +/*
+ * 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 org.apache.tuscany.sca.monitor;
+
+
+/**
+ * Denotes an exception that has been logged and recorded in the monitor.
+ *
+ * @version $Rev$ $Date$
+ */
+public class MonitorRuntimeException extends RuntimeException {
+ private static final long serialVersionUID = 8972044333077591932L;
+
+ public MonitorRuntimeException() {
+ super();
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public MonitorRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * @param message
+ */
+ public MonitorRuntimeException(String message) {
+ super(message);
+ }
+
+ /**
+ * @param cause
+ */
+ public MonitorRuntimeException(Throwable cause) {
+ super(cause);
+ }
+}
diff --git a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index 7d64857306..4a93993560 100644 --- a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -58,6 +58,7 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtens import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionService; import org.apache.tuscany.sca.contribution.service.util.FileHelper; import org.apache.tuscany.sca.core.ExtensionPointRegistry; @@ -68,6 +69,7 @@ import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation; import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; +import org.apache.tuscany.sca.monitor.MonitorRuntimeException; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; import org.apache.tuscany.sca.node.SCAClient; @@ -140,6 +142,8 @@ public class NodeImpl implements SCANode, SCAClient { // Configure the node configureNode(configuration); + } catch (ServiceRuntimeException e) { + throw e; } catch (Exception e) { throw new ServiceRuntimeException(e); } @@ -376,6 +380,8 @@ public class NodeImpl implements SCANode, SCAClient { // Configure the node configureNode(configuration); + } catch (ServiceRuntimeException e) { + throw e; } catch (Exception e) { throw new ServiceRuntimeException(e); } @@ -440,6 +446,8 @@ public class NodeImpl implements SCANode, SCAClient { // Configure the node configureNode(configuration); + } catch (ServiceRuntimeException e) { + throw e; } catch (Exception e) { throw new ServiceRuntimeException(e); } @@ -584,7 +592,11 @@ public class NodeImpl implements SCANode, SCAClient { logger.log(Level.INFO, "Loading composite: " + compositeURL); // InputStream is = compositeURL.openStream(); // XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - composite = compositeDocProcessor.read(null, uri, compositeURL); + try { + composite = compositeDocProcessor.read(null, uri, compositeURL); + } catch (ContributionReadException e) { + // ignore - errors will be detected by analyzeProblems() call below + } // reader.close(); analyzeProblems(); @@ -696,9 +708,9 @@ public class NodeImpl implements SCANode, SCAClient { for (Problem problem : monitor.getProblems()) { if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) { if (problem.getCause() != null) { - throw problem.getCause(); + throw new ServiceRuntimeException(new MonitorRuntimeException(problem.getCause())); } else { - throw new ServiceRuntimeException(problem.toString()); + throw new ServiceRuntimeException(new MonitorRuntimeException(problem.toString())); } } } diff --git a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java index 7be1e14988..59d050734c 100644 --- a/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java +++ b/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java @@ -24,6 +24,7 @@ import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -376,6 +377,13 @@ final class NodeLauncherUtil { return node; } catch (Exception e) { + Throwable ce = e instanceof InvocationTargetException ? e.getCause() : e; + if (ce.getClass().getName().equals("org.osoa.sca.ServiceRuntimeException") && + ce.getCause() != null && + ce.getCause().getClass().getName().equals("org.apache.tuscany.sca.monitor.MonitorRuntimeException")) { + NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created"); + throw new LauncherException("SCA Node could not be created"); + } NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created", e); throw new LauncherException(e); } finally { |