Author: jsdelfino
Date: Sun Mar 9 15:42:05 2008
New Revision: 635387
URL: http://svn.apache.org/viewvc?rev=635387&view=rev
Log:
Use import.resource to share a common store.html page instead of having to copy
it to all the modules.
Added:
incubator/tuscany/java/sca/tutorial/store-eu/uiservices/store-eu.html
- copied unchanged from r635281,
incubator/tuscany/java/sca/tutorial/store-eu/uiservices/store.html
Removed:
incubator/tuscany/java/sca/tutorial/store-db/uiservices/
incubator/tuscany/java/sca/tutorial/store-eu/uiservices/store.html
incubator/tuscany/java/sca/tutorial/store-merger/uiservices/
incubator/tuscany/java/sca/tutorial/store-supplier/uiservices/
incubator/tuscany/java/sca/tutorial/store/uiservices/
Modified:
incubator/tuscany/java/sca/tutorial/assets/tutorial.html
incubator/tuscany/java/sca/tutorial/store-db/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/tutorial/store-db/store-db.composite
incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
incubator/tuscany/java/sca/tutorial/store-merger/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
incubator/tuscany/java/sca/tutorial/store-supplier/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
Modified: incubator/tuscany/java/sca/tutorial/assets/tutorial.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/tutorial.html?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/tutorial.html (original)
+++ incubator/tuscany/java/sca/tutorial/assets/tutorial.html Sun Mar 9
15:42:05 2008
@@ -29,6 +29,6 @@
<h2><a href="http://localhost:8102/ui/store.html";>Online Store - Cart
Database</a>
<h2><a href="http://localhost:8103/ui/store.html";>Online Store - Supplier</a>
<h2><a href="http://localhost:8103/CatalogWebService?wsdl";>Merged Catalog Web
Service</a>
-<h2><a href="http://localhost:8104/ui/store.html";>EU Online Store</a>
+<h2><a href="http://localhost:8104/ui/store-eu.html";>EU Online Store</a>
</body>
</html>
Modified:
incubator/tuscany/java/sca/tutorial/store-db/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-db/META-INF/sca-contribution.xml?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/META-INF/sca-contribution.xml
(original)
+++ incubator/tuscany/java/sca/tutorial/store-db/META-INF/sca-contribution.xml
Sun Mar 9 15:42:05 2008
@@ -22,5 +22,6 @@
<import.java package="services"/>
<import.java package="services.merger"/>
<import.java package="services.db"/>
+ <import.resource uri="uiservices/store.html"/>
<deployable composite="s:store-db"/>
</contribution>
Modified: incubator/tuscany/java/sca/tutorial/store-db/store-db.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-db/store-db.composite?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/store-db.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/store-db.composite Sun Mar 9
15:42:05 2008
@@ -22,42 +22,42 @@
targetNamespace="http://store";
name="store-db">
- <component name="Store">
+ <component name="StoreDB">
<t:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
<t:binding.http uri="http://localhost:8102/ui"/>
</service>
- <reference name="catalog" target="Catalog">
+ <reference name="catalog" target="StoreDBCatalog">
<t:binding.jsonrpc/>
</reference>
- <reference name="shoppingCart" target="ShoppingCart/Cart">
+ <reference name="shoppingCart"
target="StoreDBShoppingCart/Cart">
<t:binding.atom/>
</reference>
- <reference name="shoppingTotal" target="ShoppingCart/Total">
+ <reference name="shoppingTotal"
target="StoreDBShoppingCart/Total">
<t:binding.jsonrpc/>
</reference>
</component>
- <component name="Catalog">
+ <component name="StoreDBCatalog">
<implementation.java
class="services.merger.MergedCatalogImpl"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="http://localhost:8102/Catalog"/>
</service>
- <reference name="fruitsCatalog" target="FruitsCatalog"/>
+ <reference name="fruitsCatalog" target="StoreDBFruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
<binding.ws/>
</reference>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreDBCurrencyConverter"/>
</component>
- <component name="FruitsCatalog">
+ <component name="StoreDBFruitsCatalog">
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreDBCurrencyConverter"/>
</component>
- <component name="ShoppingCart">
+ <component name="StoreDBShoppingCart">
<implementation.java class="services.db.ShoppingCartTableImpl"/>
<property name="database">cart-db</property>
<service name="Cart">
@@ -68,7 +68,7 @@
</service>
</component>
- <component name="CurrencyConverter">
+ <component name="StoreDBCurrencyConverter">
<implementation.java class="services.CurrencyConverterImpl"/>
</component>
Modified: incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite Sun Mar 9
15:42:05 2008
@@ -22,23 +22,23 @@
targetNamespace="http://store";
name="store-eu">
- <component name="Store">
- <t:implementation.widget location="uiservices/store.html"/>
+ <component name="StoreEU">
+ <t:implementation.widget location="uiservices/store-eu.html"/>
<service name="Widget">
<t:binding.http uri="http://localhost:8104/ui"/>
</service>
- <reference name="catalog" target="Catalog">
+ <reference name="catalog" target="StoreEUCatalog">
<t:binding.jsonrpc/>
</reference>
- <reference name="shoppingCart" target="ShoppingCart/Cart">
+ <reference name="shoppingCart"
target="StoreEUShoppingCart/Cart">
<t:binding.atom/>
</reference>
- <reference name="shoppingTotal" target="ShoppingCart/Total">
+ <reference name="shoppingTotal"
target="StoreEUShoppingCart/Total">
<t:binding.jsonrpc/>
</reference>
</component>
- <component name="Catalog">
+ <component name="StoreEUCatalog">
<implementation.java
class="services.merger.MergedCatalogImpl"/>
<property name="currencyCode">EUR</property>
<service name="Catalog">
@@ -56,7 +56,7 @@
</reference>
</component>
- <component name="ShoppingCart">
+ <component name="StoreEUShoppingCart">
<implementation.java class="services.db.ShoppingCartTableImpl"/>
<property name="database">cart-eu-db</property>
<service name="Cart">
Modified:
incubator/tuscany/java/sca/tutorial/store-merger/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/META-INF/sca-contribution.xml?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tutorial/store-merger/META-INF/sca-contribution.xml
(original)
+++
incubator/tuscany/java/sca/tutorial/store-merger/META-INF/sca-contribution.xml
Sun Mar 9 15:42:05 2008
@@ -21,5 +21,6 @@
xmlns:s="http://store";>
<import.java package="services" />
<import.java package="services.merger" />
+ <import.resource uri="uiservices/store.html"/>
<deployable composite="s:store-merger" />
</contribution>
Modified:
incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite Sun
Mar 9 15:42:05 2008
@@ -22,42 +22,42 @@
targetNamespace="http://store";
name="store-merger">
- <component name="Store">
+ <component name="StoreMerger">
<t:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
<t:binding.http uri="http://localhost:8101/ui"/>
</service>
- <reference name="catalog" target="Catalog">
+ <reference name="catalog" target="StoreMergerCatalog">
<t:binding.jsonrpc/>
</reference>
- <reference name="shoppingCart" target="ShoppingCart/Cart">
+ <reference name="shoppingCart"
target="StoreMergerShoppingCart/Cart">
<t:binding.atom/>
</reference>
- <reference name="shoppingTotal" target="ShoppingCart/Total">
+ <reference name="shoppingTotal"
target="StoreMergerShoppingCart/Total">
<t:binding.jsonrpc/>
</reference>
</component>
- <component name="Catalog">
+ <component name="StoreMergerCatalog">
<implementation.java
class="services.merger.MergedCatalogImpl"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="http://localhost:8101/Catalog"/>
</service>
- <reference name="fruitsCatalog" target="FruitsCatalog"/>
+ <reference name="fruitsCatalog"
target="StoreMergerFruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
<binding.ws/>
</reference>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreMergerCurrencyConverter"/>
</component>
- <component name="FruitsCatalog">
+ <component name="StoreMergerFruitsCatalog">
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreMergerCurrencyConverter"/>
</component>
- <component name="ShoppingCart">
+ <component name="StoreMergerShoppingCart">
<implementation.java class="services.ShoppingCartImpl"/>
<service name="Cart">
<t:binding.atom
uri="http://localhost:8101/ShoppingCart/Cart"/>
@@ -67,7 +67,7 @@
</service>
</component>
- <component name="CurrencyConverter">
+ <component name="StoreMergerCurrencyConverter">
<implementation.java class="services.CurrencyConverterImpl"/>
</component>
Modified:
incubator/tuscany/java/sca/tutorial/store-supplier/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/META-INF/sca-contribution.xml?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tutorial/store-supplier/META-INF/sca-contribution.xml
(original)
+++
incubator/tuscany/java/sca/tutorial/store-supplier/META-INF/sca-contribution.xml
Sun Mar 9 15:42:05 2008
@@ -22,5 +22,6 @@
<import.java package="services"/>
<import.java package="services.merger"/>
<import.java package="services.db"/>
+ <import.resource uri="uiservices/store.html"/>
<deployable composite="s:store-supplier"/>
</contribution>
Modified:
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite?rev=635387&r1=635386&r2=635387&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
Sun Mar 9 15:42:05 2008
@@ -22,43 +22,43 @@
targetNamespace="http://store";
name="store-supplier">
- <component name="Store">
+ <component name="StoreSupplier">
<t:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
<t:binding.http uri="http://localhost:8103/ui"/>
</service>
- <reference name="catalog" target="Catalog">
+ <reference name="catalog" target="StoreSupplierCatalog">
<t:binding.jsonrpc/>
</reference>
- <reference name="shoppingCart" target="ShoppingCart/Cart">
+ <reference name="shoppingCart"
target="StoreSupplierShoppingCart/Cart">
<t:binding.atom/>
</reference>
- <reference name="shoppingTotal" target="ShoppingCart/Total">
+ <reference name="shoppingTotal"
target="StoreSupplierShoppingCart/Total">
<t:binding.jsonrpc/>
</reference>
</component>
- <component name="Catalog">
+ <component name="StoreSupplierCatalog">
<implementation.java
class="services.merger.MergedCatalogImpl"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="http://localhost:8103/Catalog"/>
<binding.ws
uri="http://localhost:8103/CatalogWebService"/>
</service>
- <reference name="fruitsCatalog" target="FruitsCatalog"/>
+ <reference name="fruitsCatalog"
target="StoreSupplierFruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
<binding.ws/>
</reference>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreSupplierCurrencyConverter"/>
</component>
- <component name="FruitsCatalog">
+ <component name="StoreSupplierFruitsCatalog">
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter"
target="CurrencyConverter"/>
+ <reference name="currencyConverter"
target="StoreSupplierCurrencyConverter"/>
</component>
- <component name="ShoppingCart">
+ <component name="StoreSupplierShoppingCart">
<implementation.java class="services.db.ShoppingCartTableImpl"/>
<property name="database">cart-db</property>
<service name="Cart">
@@ -69,7 +69,7 @@
</service>
</component>
- <component name="CurrencyConverter">
+ <component name="StoreSupplierCurrencyConverter">
<implementation.java class="services.CurrencyConverterImpl"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
