You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/10/27 21:29:55 UTC
svn commit: r589193 - in /incubator/tuscany/java/sca/tutorial:
assets/services/ assets/services/merged/ assets/services/merger/ store-eu/
store-eu/launch/ store/ store/uiservices/
Author: jsdelfino
Date: Sat Oct 27 12:29:54 2007
New Revision: 589193
URL: http://svn.apache.org/viewvc?rev=589193&view=rev
Log:
Refactored merger package, removed workarounds now that arrays work with Web Services.
Added:
incubator/tuscany/java/sca/tutorial/assets/services/merged/
- copied from r589155, incubator/tuscany/java/sca/tutorial/assets/services/merger/
incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchEUStore.java
- copied, changed from r589155, incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchStore.java
incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
- copied, changed from r589155, incubator/tuscany/java/sca/tutorial/store-eu/store.composite
Removed:
incubator/tuscany/java/sca/tutorial/assets/services/Vegetables.java
incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalog.java
incubator/tuscany/java/sca/tutorial/assets/services/merged/Vegetables.java
incubator/tuscany/java/sca/tutorial/assets/services/merged/VegetablesCatalog.java
incubator/tuscany/java/sca/tutorial/assets/services/merger/
incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchStore.java
incubator/tuscany/java/sca/tutorial/store-eu/store.composite
Modified:
incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalogImpl.java
incubator/tuscany/java/sca/tutorial/assets/services/merged/MergedCatalogImpl.java
incubator/tuscany/java/sca/tutorial/store/store.composite
incubator/tuscany/java/sca/tutorial/store/uiservices/store.html
Modified: incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalogImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalogImpl.java?rev=589193&r1=589192&r2=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalogImpl.java (original)
+++ incubator/tuscany/java/sca/tutorial/assets/services/VegetablesCatalogImpl.java Sat Oct 27 12:29:54 2007
@@ -24,7 +24,7 @@
import org.osoa.sca.annotations.Init;
-public class VegetablesCatalogImpl implements VegetablesCatalog {
+public class VegetablesCatalogImpl implements Catalog {
private List<String> catalog = new ArrayList<String>();
@Init
@@ -34,10 +34,9 @@
catalog.add("Cauliflower - $1.55");
}
- public Vegetables get() {
- Vegetables vegetables = new Vegetables();
- vegetables.items = new String[catalog.size()];
- catalog.toArray(vegetables.items);
- return vegetables;
+ public String[] get() {
+ String[] catalogArray = new String[catalog.size()];
+ catalog.toArray(catalogArray);
+ return catalogArray;
}
}
Modified: incubator/tuscany/java/sca/tutorial/assets/services/merged/MergedCatalogImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/services/merged/MergedCatalogImpl.java?rev=589193&r1=589155&r2=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/services/merged/MergedCatalogImpl.java (original)
+++ incubator/tuscany/java/sca/tutorial/assets/services/merged/MergedCatalogImpl.java Sat Oct 27 12:29:54 2007
@@ -17,31 +17,48 @@
* under the License.
*/
-package services.merger;
+package services.merged;
+import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import services.Catalog;
+import services.CurrencyConverter;
public class MergedCatalogImpl implements Catalog {
+ @Property
+ public String currencyCode = "USD";
+
+ @Reference
+ public CurrencyConverter currencyConverter;
+
@Reference
public Catalog fruitsCatalog;
@Reference
- public VegetablesCatalog vegetablesCatalog;
+ public Catalog vegetablesCatalog;
public String[] get() {
+ String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
+
String[] fruits = fruitsCatalog.get();
- Vegetables vegetables = vegetablesCatalog.get();
+ String[] vegetables = vegetablesCatalog.get();
- String[] catalog = new String[fruits.length + vegetables.items.length];
+ String[] catalog = new String[fruits.length + vegetables.length];
int i =0;
for (String fruit: fruits) {
- catalog[i++] = fruit;
+ String name = fruit.substring(0, fruit.indexOf('-') - 1);
+ double price = Double.parseDouble(fruit.substring(fruit.indexOf('-') + 3));
+ price = currencyConverter.getConversion("USD", currencyCode, price);
+ catalog[i++] = name + " - " + currencySymbol + price;
}
- for (String vegetable: vegetables.items) {
- catalog[i++] = vegetable;
+
+ for (String vegetable: vegetables) {
+ String name = vegetable.substring(0, vegetable.indexOf('-') - 1);
+ double price = Double.parseDouble(vegetable.substring(vegetable.indexOf('-') + 3));
+ price = currencyConverter.getConversion("USD", currencyCode, price);
+ catalog[i++] = name + " - " + currencySymbol + price;
}
return catalog;
Copied: incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchEUStore.java (from r589155, incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchStore.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchEUStore.java?p2=incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchEUStore.java&p1=incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchStore.java&r1=589155&r2=589193&rev=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchStore.java (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/launch/LaunchEUStore.java Sat Oct 27 12:29:54 2007
@@ -27,13 +27,13 @@
import org.apache.tuscany.sca.node.SCANodeFactory;
import org.apache.tuscany.sca.node.util.SCAContributionUtil;
-public class LaunchStore {
+public class LaunchEUStore {
public static void main(String[] args) throws Exception {
System.out.println("Starting ...");
SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode("http://localhost:8100/store", "http://localhost:9999");
+ SCANode node = nodeFactory.createSCANode("http://localhost:8101/store", "http://localhost:9999");
- URL contribution = SCAContributionUtil.findContributionFromClass(LaunchStore.class);
+ URL contribution = SCAContributionUtil.findContributionFromClass(LaunchEUStore.class);
node.addContribution("http://store", contribution);
node.addToDomainLevelComposite(new QName("http://store", "store"));
Copied: incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite (from r589155, incubator/tuscany/java/sca/tutorial/store-eu/store.composite)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite?p2=incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite&p1=incubator/tuscany/java/sca/tutorial/store-eu/store.composite&r1=589155&r2=589193&rev=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/store.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite Sat Oct 27 12:29:54 2007
@@ -20,8 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://store"
- xmlns:s="http://store"
- name="store">
+ name="store-eu">
<component name="ui">
<t:implementation.resource location="uiservices"/>
@@ -30,16 +29,6 @@
</service>
</component>
- <component name="Catalog">
- <implementation.java class="services.FruitsCatalogImpl"/>
- <property name="currencyCode">USD</property>
- <service name="Catalog">
- <binding.sca/>
- <t:binding.jsonrpc uri="CatalogJS"/>
- </service>
- <reference name="currencyConverter" target="CurrencyConverter"/>
- </component>
-
<component name="ShoppingCart">
<implementation.java class="services.ShoppingCartImpl"/>
<service name="Collection">
@@ -47,20 +36,16 @@
</service>
</component>
- <component name="CurrencyConverter">
- <implementation.java class="services.CurrencyConverterImpl"/>
- </component>
-
- <!--
<component name="Catalog">
- <implementation.java class="services.merger.MergedCatalogImpl"/>
+ <implementation.java class="services.merged.MergedCatalogImpl"/>
+ <property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="CatalogJS"/>
<binding.ws uri="CatalogWS"/>
</service>
- <reference name="fruitsCatalog" target="FruitsCatalog"/>
+ <reference name="fruitsCatalog" target="CloudFruitsCatalog"/>
<reference name="vegetablesCatalog" target="CloudVegetablesCatalog"/>
+ <reference name="currencyConverter" target="CloudCurrencyConverter"/>
</component>
- -->
</composite>
Modified: incubator/tuscany/java/sca/tutorial/store/store.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/store.composite?rev=589193&r1=589192&r2=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/store.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store/store.composite Sat Oct 27 12:29:54 2007
@@ -53,13 +53,15 @@
<!--
<component name="Catalog">
- <implementation.java class="services.merger.MergedCatalogImpl"/>
+ <implementation.java class="services.merged.MergedCatalogImpl"/>
+ <property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="CatalogJS"/>
<binding.ws uri="CatalogWS"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
<reference name="vegetablesCatalog" target="CloudVegetablesCatalog"/>
+ <reference name="currencyConverter" target="CurrencyConverter"/>
</component>
-->
Modified: incubator/tuscany/java/sca/tutorial/store/uiservices/store.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/uiservices/store.html?rev=589193&r1=589192&r2=589193&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/uiservices/store.html (original)
+++ incubator/tuscany/java/sca/tutorial/store/uiservices/store.html Sat Oct 27 12:29:54 2007
@@ -32,10 +32,9 @@
function catalog_getResponse(items) {
var catalog = "";
- alert(items);
for (var i=0; i<items.length; i++) {
catalog += '<input name="items" type="checkbox" value="' +
- item[i] + '">' + item[i] + ' <br>';
+ items[i] + '">' + items[i] + ' <br>';
}
document.getElementById('catalog').innerHTML=catalog;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org