Author: slaws
Date: Thu Nov 26 21:55:53 2009
New Revision: 884708
URL: http://svn.apache.org/viewvc?rev=884708&view=rev
Log:
Take account of composite name changes
Added:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
(with props)
Removed:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
Thu Nov 26 21:55:53 2009
@@ -24,7 +24,7 @@
xmlns:ns2="http://tuscany.apache.org/cloud";>
<include name="ns2:ui" uri="http://tuscany.apache.org/cloud"; />
- <include name="ns2:frontend" uri="http://tuscany.apache.org/cloud"; />
+ <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud"; />
<include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud"; />
<include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud"; />
<include name="ns2:currency" uri="http://tuscany.apache.org/cloud"; />
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
Thu Nov 26 21:55:53 2009
@@ -25,7 +25,7 @@
name="bespoketrip">
<component name="bespoketrip">
- <t:implementation.node uri="fullapp-bespoketrip"
composite="s:bespoketrip"/>
+ <t:implementation.node uri="fullapp-bespoketrip"
composite="s:fullapp-bespoketrip"/>
<service name="Node">
<binding.sca uri="http://localhost:8086"/>
<binding.ws uri="http://localhost:8086"/>
Added:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite?rev=884708&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
(added)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
Thu Nov 26 21:55:53 2009
@@ -0,0 +1,36 @@
+<?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";
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://tuscany.apache.org/cloud";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+ xmlns:s="http://tuscanyscatours.com/";
+ name="coordination">
+
+ <component name="coordination">
+ <t:implementation.node uri="fullapp-coordination"
composite="s:fullapp-coordination"/>
+ <service name="Node">
+ <binding.sca uri="http://localhost:8084"/>
+ <binding.ws uri="http://localhost:8084"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8084"/>
+ </service>
+ </component>
+
+</composite>
Propchange:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-coordination.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
Thu Nov 26 21:55:53 2009
@@ -25,7 +25,7 @@
name="currency">
<component name="currency">
- <t:implementation.node uri="fullapp-currency" composite="s:currency"/>
+ <t:implementation.node uri="fullapp-currency"
composite="s:fullapp-currency"/>
<service name="Node">
<binding.sca uri="http://localhost:8083"/>
<binding.ws uri="http://localhost:8083"/>
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
Thu Nov 26 21:55:53 2009
@@ -25,7 +25,7 @@
name="packagedtrip">
<component name="packagedtrip">
- <t:implementation.node uri="fullapp-packagedtrip"
composite="s:packagedtrip"/>
+ <t:implementation.node uri="fullapp-packagedtrip"
composite="s:fullapp-packagedtrip"/>
<service name="Node">
<binding.sca uri="http://localhost:8085"/>
<tuscany:binding.jsonrpc uri="http://localhost:8085"/>
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
Thu Nov 26 21:55:53 2009
@@ -25,7 +25,7 @@
name="shoppingcart">
<component name="shoppingcart">
- <t:implementation.node uri="fullapp-shoppingcart"
composite="s:shoppingcart"/>
+ <t:implementation.node uri="fullapp-shoppingcart"
composite="s:fullapp-shoppingcart"/>
<service name="Node">
<binding.sca uri="http://localhost:8087"/>
<binding.ws uri="http://localhost:8087"/>
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
Thu Nov 26 21:55:53 2009
@@ -24,7 +24,7 @@
name="ui">
<component name="ui">
- <t:implementation.node uri="fullapp-ui" composite="s:ui"/>
+ <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>
<service name="Node">
<binding.sca uri="http://localhost:8080"/>
</service>
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
Thu Nov 26 21:55:53 2009
@@ -25,11 +25,11 @@
<include name="ns2:creditcard" uri="fullapp-creditcard" />
<include name="ns2:payment" uri="fullapp-payment" />
- <include name="ns2:shoppingcart" uri="fullapp-shoppingcart" />
- <include name="ns2:currency" uri="fullapp-currency" />
- <include name="ns2:packagedtrip" uri="fullapp-packagedtrip" />
- <include name="ns2:bespoketrip" uri="fullapp-bespoketrip" />
- <include name="ns2:frontend" uri="fullapp-frontend" />
- <include name="ns2:ui" uri="fullapp-ui" />
+ <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
+ <include name="ns2:fullapp-currency" uri="fullapp-currency" />
+ <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" />
+ <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />
+ <include name="ns2:fullapp-fcoordination" uri="fullapp-coordination" />
+ <include name="ns2:fullapp-ui" uri="fullapp-ui" />
</composite>
Modified:
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml?rev=884708&r1=884707&r2=884708&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
(original)
+++
tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
Thu Nov 26 21:55:53 2009
@@ -19,23 +19,23 @@
-->
<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0";>
- <contribution
location="file:../../../../contributions/common/target/scatours-contribution-common.jar"
uri="common"/>
- <contribution
location="file:../../../../contributions/currency/target/scatours-contribution-currency.jar"
uri="currency"/>
- <contribution
location="file:../../../../contributions/hotel/target/scatours-contribution-hotel.jar"
uri="hotel"/>
- <contribution
location="file:../../../../contributions/flight/target/scatours-contribution-flight.jar"
uri="flight"/>
- <contribution
location="file:../../../../contributions/car/target/scatours-contribution-car.jar"
uri="car"/>
- <contribution
location="file:../../../../contributions/trip/target/scatours-contribution-trip.jar"
uri="trip"/>
- <contribution
location="file:../../../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"
uri="tripbooking"/>
- <contribution
location="file:../../../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"
uri="travelcatalog"/>
- <contribution
location="file:../../../../contributions/payment-java/target/scatours-contribution-payment-java.jar"
uri="fullapp-payment"/>
- <contribution
location="file:../../../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"
uri="fullapp-creditcard"/>
- <contribution
location="file:../../../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"
uri="shoppingcart"/>
- <contribution
location="file:../../../../contributions/scatours/target/scatours-contribution-scatours.jar"
uri="scatours"/>
- <contribution
location="file:../../../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"
uri="fullapp-ui"/>
- <contribution
location="file:../../../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-frontend.jar"
uri="fullapp-frontend"/>
- <contribution
location="file:../../../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"
uri="fullapp-currency"/>
- <contribution
location="file:../../../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"
uri="fullapp-packagedtrip"/>
- <contribution
location="file:../../../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"
uri="fullapp-bespoketrip"/>
- <contribution
location="file:../../../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"
uri="fullapp-shoppingcart"/>
+ <contribution
location="file:../../contributions/common/target/scatours-contribution-common.jar"
uri="common"/>
+ <contribution
location="file:../../contributions/currency/target/scatours-contribution-currency.jar"
uri="currency"/>
+ <contribution
location="file:../../contributions/hotel/target/scatours-contribution-hotel.jar"
uri="hotel"/>
+ <contribution
location="file:../../contributions/flight/target/scatours-contribution-flight.jar"
uri="flight"/>
+ <contribution
location="file:../../contributions/car/target/scatours-contribution-car.jar"
uri="car"/>
+ <contribution
location="file:../../contributions/trip/target/scatours-contribution-trip.jar"
uri="trip"/>
+ <contribution
location="file:../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"
uri="tripbooking"/>
+ <contribution
location="file:../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"
uri="travelcatalog"/>
+ <contribution
location="file:../../contributions/payment-java/target/scatours-contribution-payment-java.jar"
uri="fullapp-payment"/>
+ <contribution
location="file:../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"
uri="fullapp-creditcard"/>
+ <contribution
location="file:../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"
uri="shoppingcart"/>
+ <contribution
location="file:../../contributions/scatours/target/scatours-contribution-scatours.jar"
uri="scatours"/>
+ <contribution
location="file:../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"
uri="fullapp-ui"/>
+ <contribution
location="file:../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-coordination.jar"
uri="fullapp-coordination"/>
+ <contribution
location="file:../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"
uri="fullapp-currency"/>
+ <contribution
location="file:../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"
uri="fullapp-packagedtrip"/>
+ <contribution
location="file:../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"
uri="fullapp-bespoketrip"/>
+ <contribution
location="file:../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"
uri="fullapp-shoppingcart"/>
<contribution location="file:./cloud"
uri="http://tuscany.apache.org/cloud"/>
</workspace>
\ No newline at end of file
