svn commit: r588055 - in /incubator/tuscany/java/sca/tutorial/store-catalog/src/main: java/services/Catalog.java java/services/CatalogImpl.java java/services/CurrencyConverter.java resources/store-catalog.composite

[jsdelfino]

Author: jsdelfino
Date: Wed Oct 24 15:19:35 2007
New Revision: 588055

URL: http://svn.apache.org/viewvc?rev=588055&view=rev
Log:
Removed dependency on currency converter. Use a different business interface to 
show how to merge with the other catalog from the store module. Provide the 
catalog service as a web service.

Removed:
    
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CurrencyConverter.java
Modified:
    
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/Catalog.java
    
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CatalogImpl.java
    
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/resources/store-catalog.composite

Modified: 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/Catalog.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/Catalog.java?rev=588055&r1=588054&r2=588055&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/Catalog.java
 (original)
+++ 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/Catalog.java
 Wed Oct 24 15:19:35 2007
@@ -19,9 +19,11 @@
 
 package services;
 
+import java.util.List;
+
 import org.osoa.sca.annotations.Remotable;
 
 @Remotable
 public interface Catalog {
-    String[] get();
+    List<String> get();
 }

Modified: 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CatalogImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CatalogImpl.java?rev=588055&r1=588054&r2=588055&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CatalogImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/java/services/CatalogImpl.java
 Wed Oct 24 15:19:35 2007
@@ -23,27 +23,18 @@
 import java.util.List;
 
 import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
 
 public class CatalogImpl implements Catalog {
-    @Property
-    public String currencyCode = "USD";
-    @Reference
-    public CurrencyConverter currencyConverter;
     private List<String> catalog = new ArrayList<String>();
 
     @Init
     public void init() {
-        String currencySymbol = 
currencyConverter.getCurrencySymbol(currencyCode);
-        catalog.add("Apple - " + currencySymbol + 
currencyConverter.getConversion("USD", currencyCode, 2.99f));
-        catalog.add("Orange - " + currencySymbol + 
currencyConverter.getConversion("USD", currencyCode, 3.55f));
-        catalog.add("Pear - " + currencySymbol + 
currencyConverter.getConversion("USD", currencyCode, 1.55f));
+        catalog.add("Broccoli - " + 2.99f);
+        catalog.add("Asparagus - " + 3.55f);
+        catalog.add("Cauliflower - " + 1.55f);
     }
 
-    public String[] get() {
-        String[] catalogArray = new String[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
+    public List<String> get() {
+        return catalog;
     }
 }

Modified: 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/resources/store-catalog.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-catalog/src/main/resources/store-catalog.composite?rev=588055&r1=588054&r2=588055&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/resources/store-catalog.composite
 (original)
+++ 
incubator/tuscany/java/sca/tutorial/store-catalog/src/main/resources/store-catalog.composite
 Wed Oct 24 15:19:35 2007
@@ -19,13 +19,14 @@
 -->
 <composite     xmlns="http://www.osoa.org/xmlns/sca/1.0";
                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
-               xmlns:s="http://store";                  
+               targetNamespace="http://store";                  
                name="store-catalog">
                
-       <component name="Catalog">
+       <component name="Catalog">
                <implementation.java class="services.CatalogImpl"/> 
-               <property name="currencyCode">USD</property>
-               <reference name="currencyConverter" 
target="CurrencyConverter"/>        
+               <service name="Catalog">
+                 <binding.ws/>
+               </service>
        </component> 
        
 </composite>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]