Author: slaws
Date: Thu Nov 26 21:51:04 2009
New Revision: 884703
URL: http://svn.apache.org/viewvc?rev=884703&view=rev
Log:
A bit of tidying in the full-app. Mainly renaming frontend to coordination and
correcting the composite names in the full app contributions
Added:
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
- copied, changed from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-coordination/
tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
(with props)
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
(with props)
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
(with props)
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
- copied, changed from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
- copied, changed from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
- copied, changed from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
- copied, changed from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
Removed:
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-frontend/
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
Modified:
tuscany/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
tuscany/sandbox/travelsample/contributions/pom.xml
Modified:
tuscany/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
(original)
+++
tuscany/sandbox/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
Thu Nov 26 21:51:04 2009
@@ -48,7 +48,7 @@
public static void setUpBeforeClass() throws Exception {
try {
node =
- SCANodeFactory.newInstance().createSCANode(null, new
SCAContribution("creditcard", "./target/classes"));
+
SCANodeFactory.newInstance().createSCANode("creditcard.composite", new
SCAContribution("creditcard", "./target/classes"));
node.start();
} catch (Exception ex) {
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <deployable composite="scatours:bespoketrip" />
+ <deployable composite="scatours:fullapp-bespoketrip" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.hotel" />
<import.java package="com.tuscanyscatours.hotel.impl" />
Copied:
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
(from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite?p2=tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite&p1=tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite&r1=884469&r2=884703&rev=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
Thu Nov 26 21:51:04 2009
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://tuscanyscatours.com/";
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- name="bespoketrip">
+ name="fullapp-bespoketrip">
- <component name="Hotel">
+ <component name="HotelPartner">
<implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
<service name="Search">
<binding.ws name="searchws"
uri="http://localhost:8086/Hotel/Search"/>
@@ -34,7 +34,7 @@
<service name="Book"/>
</component>
- <component name="Flight">
+ <component name="FlightPartner">
<implementation.java
class="com.tuscanyscatours.flight.impl.FlightImpl"/>
<service name="Search">
<interface.java interface="com.tuscanyscatours.common.Search"
@@ -48,7 +48,7 @@
<service name="Book"/>
</component>
- <component name="Car">
+ <component name="CarPartner">
<implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
<service name="Search">
<binding.ws name="searchws"
uri="http://localhost:8086/Car/Search"/>
Added: tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml?rev=884703&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
(added)
+++ tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml Thu
Nov 26 21:51:04 2009
@@ -0,0 +1,90 @@
+<?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>tuscany-scatours</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent><version>1.0-SNAPSHOT</version>
+ <artifactId>scatours-contribution-fullapp-coordination</artifactId>
+ <name>Apache Tuscany SCA Tours Full Application Coordination
Contribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>${tuscany.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ <version>${tuscany.version}</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.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>${tuscany.version}</version>
+ <executions>
+ <execution>
+ <configuration>
+ <mainClass>scatours.LaunchNode</mainClass>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ -->
+ </build>
+</project>
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml?rev=884703&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -0,0 +1,30 @@
+<?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://tuscanyscatours.com/";>
+ <deployable composite="scatours:fullapp-coordination" />
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.currencyconverter" />
+ <import.java package="com.tuscanyscatours.travelcatalog" />
+ <import.java package="com.tuscanyscatours.travelcatalog.impl" />
+ <import.java package="com.tuscanyscatours.shoppingcart" />
+ <import.java package="com.tuscanyscatours.tripbooking" />
+ <import.java package="com.tuscanyscatours.tripbooking.impl" />
+</contribution>
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite?rev=884703&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
(added)
+++
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
Thu Nov 26 21:51:04 2009
@@ -0,0 +1,72 @@
+<?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://tuscanyscatours.com/";
+ name="fullapp-coordination">
+
+ <component name="TravelCatalog">
+ <implementation.java
class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
+ <service name="TravelCatalogSearch"/>
+ <reference name="hotelSearch">
+ <binding.ws uri="http://localhost:8086/Hotel/Search"/>
+ <callback>
+ <binding.ws name="callback"
+ uri="http://localhost:8084/Hotel/SearchCallback"/>
+ </callback>
+ </reference>
+ <reference name="flightSearch">
+ <interface.java interface="com.tuscanyscatours.common.Search"
+
callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
+ <binding.ws uri="http://localhost:8086/Flight/Search"/>
+ <callback>
+ <binding.ws name="callback"
+ uri="http://localhost:8084/Flight/SearchCallback"/>
+ </callback>
+ </reference>
+ <reference name="carSearch">
+ <binding.ws uri="http://localhost:8086/Car/Search"/>
+ <callback>
+ <binding.ws name="callback"
+ uri="http://localhost:8084/Car/SearchCallback"/>
+ </callback>
+ </reference>
+ <reference name="tripSearch">
+ <binding.ws uri="http://localhost:8085/Trip/Search"/>
+ <callback>
+ <binding.ws name="callback"
+ uri="http://localhost:8084/Trip/SearchCallback"/>
+ </callback>
+ </reference>
+ <reference name="currencyConverter" target="CurrencyConverter">
+ </reference>
+ <property name="quoteCurrencyCode">GBP</property>
+ </component>
+
+ <component name="TripBooking">
+ <implementation.java
class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
+ <service name="TripBooking"/>
+ <reference name="hotelBook" target="HotelPartner/Book"/>
+ <reference name="flightBook" target="TripPartner/Book"/>
+ <reference name="carBook" target="CarPartner/Book"/>
+ <reference name="tripBook" target="TripPartner/Book"/>
+ <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>
+ </component>
+
+</composite>
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sandbox/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <deployable composite="scatours:currency" />
+ <deployable composite="scatours:fullapp-currency" />
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
Copied:
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
(from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite?p2=tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite&p1=tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite&r1=884469&r2=884703&rev=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://tuscanyscatours.com/";
- name="currency">
+ name="fullapp-currency">
<component name="CurrencyConverter">
<implementation.java
class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <deployable composite="scatours:packagedtrip" />
+ <deployable composite="scatours:fullapp-packagedtrip" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.trip.impl" />
</contribution>
Copied:
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
(from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite?p2=tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite&p1=tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite&r1=884469&r2=884703&rev=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
Thu Nov 26 21:51:04 2009
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://tuscanyscatours.com/";
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- name="packagedtrip">
+ name="fullapp-packagedtrip">
- <component name="Trip">
+ <component name="TripPartner">
<implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
<service name="Search">
<binding.ws name="searchws"
uri="http://localhost:8085/Trip/Search"/>
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <deployable composite="scatours:shoppingcart" />
+ <deployable composite="scatours:fullapp-shoppingcart" />
<import.java package="com.tuscanyscatours.payment" />
<import.java package="com.tuscanyscatours.shoppingcart" />
<import.java package="com.tuscanyscatours.shoppingcart.impl" />
Copied:
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
(from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite?p2=tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite&p1=tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite&r1=884469&r2=884703&rev=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://tuscanyscatours.com/";
- name="shoppingcart">
+ name="fullapp-shoppingcart">
<component name="ShoppingCart">
<implementation.java
class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
Thu Nov 26 21:51:04 2009
@@ -19,7 +19,7 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <deployable composite="scatours:ui" />
+ <deployable composite="scatours:fullapp-ui" />
<import.java package="com.tuscanyscatours" />
<import.java package="com.tuscanyscatours.impl" />
<import.java package="com.tuscanyscatours.shoppingcart" />
Copied:
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
(from r884469,
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite)
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite?p2=tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite&p1=tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite&r1=884469&r2=884703&rev=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
Thu Nov 26 21:51:04 2009
@@ -20,9 +20,9 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://tuscanyscatours.com/";
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- name="ui">
+ name="fullapp-ui">
- <component name="scatours">
+ <component name="SCAToursUserInterface">
<tuscany:implementation.widget location="scatours.html"/>
<service name="Widget">
<tuscany:binding.http uri="/scatours"/>
Modified:
tuscany/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
(original)
+++
tuscany/sandbox/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
Thu Nov 26 21:51:04 2009
@@ -31,22 +31,27 @@
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node;
+ private static SCANode node1;
+ private static SCANode node2;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- node =
+ node1 =
SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment",
"./target/classes"),
+ .createSCANode("payment.composite",
+ new SCAContribution("payment",
"./target/classes"));
+ node2 =
+ SCANodeFactory.newInstance()
+ .createSCANode("creditcard.composite",
new SCAContribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
- node.start();
+ node1.start();
+ node2.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node;
+ SCAClient client = (SCAClient)node1;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" +
payment.makePaymentMember("c-0", 100.00f));
@@ -66,10 +71,15 @@
@AfterClass
public static void tearDownAfterClass() throws Exception {
- if (node != null) {
- node.stop();
- node = null;
+ if (node1 != null) {
+ node1.stop();
+ node1 = null;
}
+
+ if (node2 != null) {
+ node2.stop();
+ node2 = null;
+ }
}
}
Modified:
tuscany/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
Thu Nov 26 21:51:04 2009
@@ -26,8 +26,8 @@
<service name="Payment">
<binding.ws uri="http://localhost:8081/Payment"/>
</service>
- <reference name="creditCardPaymentReference" requires="authentication">
- <binding.ws uri="http://localhost:8083/CreditCardPayment"/>
+ <reference name="creditCardPaymentReference" >
+ <binding.ws uri="http://localhost:8083/CreditCardPayment";
requires="authentication"/>
</reference>
<reference name="emailGateway" target="EmailGateway"/>
<reference name="customerRegistry" target="CustomerRegistry"/>
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=884703&r1=884702&r2=884703&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Thu Nov 26 21:51:04 2009
@@ -57,7 +57,7 @@
<module>feed-logger</module>
<module>flight</module>
<module>fullapp-ui</module>
- <module>fullapp-frontend</module>
+ <module>fullapp-coordination</module>
<module>fullapp-currency</module>
<module>fullapp-packagedtrip</module>
<module>fullapp-bespoketrip</module>
