diff options
Diffstat (limited to 'branches')
24 files changed, 1569 insertions, 21 deletions
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml b/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml index 1161ff979a..8c5504cea7 100644 --- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml +++ b/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml @@ -70,14 +70,6 @@ <version>1.5.1-SNAPSHOT</version> <scope>test</scope> </dependency> - <!-- - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.5.1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - --> <dependency> <groupId>junit</groupId> diff --git a/branches/sca-java-1.x/itest/domainmgr/pom.xml b/branches/sca-java-1.x/itest/domainmgr/pom.xml index b197b506fb..8fbd61d1e2 100644 --- a/branches/sca-java-1.x/itest/domainmgr/pom.xml +++ b/branches/sca-java-1.x/itest/domainmgr/pom.xml @@ -33,9 +33,10 @@ <packaging>pom</packaging>
<build>
- <defaultGoal>install</defaultGoal>
+ <defaultGoal>install</defaultGoal>
</build>
<modules>
<module>basic</module>
+ <module>transaction</module>
</modules>
</project>
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/pom.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/pom.xml new file mode 100644 index 0000000000..d8fd1f0904 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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-transaction</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-transaction-payment</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Transaction 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/transaction/payment/src/main/java/payment/PaymentImpl.java b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java new file mode 100644 index 0000000000..071bcf22c2 --- /dev/null +++ b/branches/sca-java-1.x/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/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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<Customer> getAllCustomers();
+
+ boolean deleteCustomer(String id);
+}
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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<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/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/branches/sca-java-1.x/itest/domainmgr/transaction/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/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/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl new file mode 100644 index 0000000000..d17497d1f6 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/payment/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/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/transaction/payment/src/main/resources/Payment.wsdl b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl new file mode 100644 index 0000000000..3885764899 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/payment/src/main/resources/definitions.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml new file mode 100644 index 0000000000..9060e75ed2 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+
+ <!-- Policy Intents Defined by the SCA Runtime -->
+ <intent name="authorization" constrains="sca:implementation"/>
+ <intent name="managedTransaction" constrains="sca:implementation"/>
+ <intent name="managedTransaction.global"/>
+
+ <!-- Policy intents -->
+ <policySet name="ps1" provides="sca:authorization" appliesTo="sca:implementation.java"/>
+
+ <policySet name="ps2" provides="sca:managedTransaction.global" appliesTo="sca:implementation.java"/>
+
+</definitions>
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/payment.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/payment.composite new file mode 100644 index 0000000000..53fcefc241 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/pom.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/pom.xml new file mode 100644 index 0000000000..f62449fc15 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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-transaction</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Transaction</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/transaction/runtest/pom.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml new file mode 100644 index 0000000000..4c5fa72112 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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-basic</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-basic-runtest</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-transaction-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/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java new file mode 100644 index 0000000000..5e641216dd --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java @@ -0,0 +1,330 @@ +/*
+ * 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 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/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..ca43648169 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/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/transaction/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..f03181ecc5 --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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/transaction/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..1379b37dce --- /dev/null +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/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-transaction-payment.jar" + uri="scatours-payment" /> +</workspace> 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 b61553e640..27eb80b3ad 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 @@ -55,6 +55,7 @@ import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl; import org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl; +import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; @@ -65,7 +66,10 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory; +import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver; import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; @@ -75,17 +79,26 @@ import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; +import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl; +import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil; import org.apache.tuscany.sca.implementation.node.NodeImplementation; import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl; 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.policy.Intent; +import org.apache.tuscany.sca.policy.IntentAttachPointType; import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; +import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.SCADefinitionsProvider; +import org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint; import org.apache.tuscany.sca.workspace.Workspace; import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; +import org.osoa.sca.ServiceRuntimeException; import org.osoa.sca.annotations.Init; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope; @@ -125,10 +138,16 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se private StAXArtifactProcessor<Composite> compositeProcessor; private XMLOutputFactory outputFactory; private ContributionDependencyBuilder contributionDependencyBuilder; - private CompositeBuilder compositeBuilder; private CompositeBuilder compositeIncludeBuilder; private CompositeBuilder nodeConfigurationBuilder; private Monitor monitor; + private List<SCADefinitions> policyDefinitions; + private ModelResolver policyDefinitionsResolver; + private SCABindingFactory scaBindingFactory; + private IntentAttachPointTypeFactory intentAttachPointTypeFactory; + private DocumentBuilderFactory documentBuilderFactory; + private TransformerFactory transformerFactory; + private InterfaceContractMapper contractMapper; /** * Initialize the component. @@ -158,26 +177,37 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se URLArtifactProcessorExtensionPoint urlProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); URLArtifactProcessor<Object> urlProcessor = new ExtensibleURLArtifactProcessor(urlProcessors, monitor); - + policyDefinitionsResolver = new DefaultModelResolver(); + policyDefinitions = new ArrayList<SCADefinitions>(); + + // The following was copied from RuntimeBuilder to fix TUSCANY-3171 + XMLInputFactory validatingInputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class); + documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class); + //documentBuilderFactory.setNamespaceAware(true); + urlProcessors.getProcessor(Composite.class); + urlProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, + documentBuilderFactory, policyDefinitions, monitor)); + // Create contribution processor modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionProcessor = new ContributionContentProcessor(extensionPoints, monitor); + contributionProcessor = new ContributionContentProcessor(extensionPoints, monitor, policyDefinitionsResolver, policyDefinitions); // Create contribution and composite builders - DocumentBuilderFactory documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class); - TransformerFactory transformerFactory = modelFactories.getFactory(TransformerFactory.class); + transformerFactory = modelFactories.getFactory(TransformerFactory.class); contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor); - SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); - IntentAttachPointTypeFactory intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); - InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class); - compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, documentBuilderFactory, transformerFactory, contractMapper, monitor); + scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); + intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); + contractMapper = utilities.getUtility(InterfaceContractMapper.class); compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor); nodeConfigurationBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, documentBuilderFactory, transformerFactory, contractMapper, null, monitor); + + // Load the definitions.xml + loadSCADefinitions(extensionPoints); } @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + // Get the request path String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8"); String key; @@ -284,6 +314,7 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se try { compositeIncludeBuilder.build(deployable); } catch (CompositeBuilderException e) { + e.printStackTrace(); //[nash] response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); } @@ -347,9 +378,17 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se } // Build the domain composite + SCADefinitions aggregatedDefinitions = new SCADefinitionsImpl(); + for (SCADefinitions definition : policyDefinitions) { + SCADefinitionsUtil.aggregateSCADefinitions(definition, aggregatedDefinitions); + } + CompositeBuilder compositeBuilder = new CompositeBuilderImpl(assemblyFactory, null, scaBindingFactory, + intentAttachPointTypeFactory, documentBuilderFactory, transformerFactory, + contractMapper, aggregatedDefinitions, monitor); try { compositeBuilder.build(domainComposite); } catch (CompositeBuilderException e) { + e.printStackTrace(); //[nash] response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); return; } @@ -416,7 +455,9 @@ 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) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, new IllegalArgumentException(queryString).toString()); + Exception e = new IllegalArgumentException(queryString); //[nash] + e.printStackTrace(); //[nash] + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); //[nash] return; } } else { @@ -427,6 +468,7 @@ 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; } @@ -516,4 +558,52 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se } } + /** + * The following code was copied from RuntimeBootStrapper to fix TUSCANY-3171 + * + * @param registry + */ + private void loadSCADefinitions(ExtensionPointRegistry registry) throws ParserConfigurationException { + try { + URLArtifactProcessorExtensionPoint documentProcessors = + registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + URLArtifactProcessor<SCADefinitions> definitionsProcessor = + documentProcessors.getProcessor(SCADefinitions.class); + SCADefinitionsProviderExtensionPoint scaDefnProviders = + registry.getExtensionPoint(SCADefinitionsProviderExtensionPoint.class); + + SCADefinitions systemSCADefinitions = new SCADefinitionsImpl(); + SCADefinitions aSCADefn = null; + for (SCADefinitionsProvider aProvider : scaDefnProviders.getSCADefinitionsProviders()) { + aSCADefn = aProvider.getSCADefinition(); + SCADefinitionsUtil.aggregateSCADefinitions(aSCADefn, systemSCADefinitions); + } + + policyDefinitions.add(systemSCADefinitions); + + //we cannot expect that providers will add the intents and policysets into the resolver + //so we do this here explicitly + for (Intent intent : systemSCADefinitions.getPolicyIntents()) { + policyDefinitionsResolver.addModel(intent); + } + + for (PolicySet policySet : systemSCADefinitions.getPolicySets()) { + policyDefinitionsResolver.addModel(policySet); + } + + for (IntentAttachPointType attachPoinType : systemSCADefinitions.getBindingTypes()) { + policyDefinitionsResolver.addModel(attachPoinType); + } + + for (IntentAttachPointType attachPoinType : systemSCADefinitions.getImplementationTypes()) { + policyDefinitionsResolver.addModel(attachPoinType); + } + + //now that all system sca definitions have been read, lets resolve them right away + definitionsProcessor.resolve(systemSCADefinitions, policyDefinitionsResolver); + } catch (Exception e) { + throw new ServiceRuntimeException(e); + } + } + } diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java index f81b386420..4aa619aa3f 100644 --- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java +++ b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java @@ -50,9 +50,13 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.contribution.scanner.ContributionScanner; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.definitions.SCADefinitions; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.IntentAttachPointType; +import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner; import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner; @@ -71,6 +75,8 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri private StAXArtifactProcessor<Object> extensionProcessor; private UtilityExtensionPoint utilities; private Monitor monitor = null; + private ModelResolver policyDefinitionsResolver = null; + private List<SCADefinitions> policyDefinitions = null; public ContributionContentProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) { this.extensionPoints = extensionPoints; @@ -89,6 +95,13 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri this.contributionFactory = modelFactories.getFactory(ContributionFactory.class); } + public ContributionContentProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor, + ModelResolver policyDefinitionsResolver, List<SCADefinitions> policyDefinitions) { + this(extensionPoints, monitor); + this.policyDefinitionsResolver = policyDefinitionsResolver; + this.policyDefinitions = policyDefinitions; + } + /* public ContributionContentProcessor(ModelFactoryExtensionPoint modelFactories, ModelResolverExtensionPoint modelResolvers, URLArtifactProcessor<Object> artifactProcessor, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) { @@ -116,7 +129,12 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri Contribution contribution = contributionFactory.createContribution(); contribution.setURI(contributionURI.toString()); contribution.setLocation(contributionURL.toString()); - ModelResolver modelResolver = new ExtensibleModelResolver(contribution, extensionPoints); + ModelResolver modelResolver; + if (policyDefinitionsResolver != null) { + modelResolver = new ExtensibleModelResolver(contribution, extensionPoints, modelResolvers, modelFactories, policyDefinitionsResolver); + } else { + modelResolver = new ExtensibleModelResolver(contribution, extensionPoints); + } contribution.setModelResolver(modelResolver); contribution.setUnresolved(true); @@ -150,6 +168,11 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri // Add the loaded model to the model resolver modelResolver.addModel(model); + // Add policy definitions to the list of policy definitions + if (policyDefinitionsResolver != null) { + addPolicyDefinitions(model); + } + // Merge contribution metadata into the contribution model if (model instanceof ContributionMetadata) { contributionMetadata = true; @@ -245,4 +268,38 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri } } } + + /** + * The following code was copied from ContributionServiceImpl to fix TUSCANY-3171 + * + * @param model + */ + private void addPolicyDefinitions(Object model) { + + // Add policy definitions to the list of policy definitions + if (model instanceof SCADefinitions) { + policyDefinitions.add((SCADefinitions)model); + + SCADefinitions definitions = (SCADefinitions)model; + for (Intent intent : definitions.getPolicyIntents() ) { + policyDefinitionsResolver.addModel(intent); + } + + for (PolicySet policySet : definitions.getPolicySets() ) { + policyDefinitionsResolver.addModel(policySet); + } + + for (IntentAttachPointType attachPointType : definitions.getBindingTypes() ) { + policyDefinitionsResolver.addModel(attachPointType); + } + + for (IntentAttachPointType attachPointType : definitions.getImplementationTypes() ) { + policyDefinitionsResolver.addModel(attachPointType); + } + for (Object binding : definitions.getBindings() ) { + policyDefinitionsResolver.addModel(binding); + } + } + } + } |