Author: jsdelfino
Date: Sat Jan  5 00:23:53 2008
New Revision: 609100

URL: http://svn.apache.org/viewvc?rev=609100&view=rev
Log:
Added necessary imports/exports to sca-contribution.xml. Worked around strange 
behavior of Node/Domain.start(). Changed URIs of ATOM and JSON services as 
store.js can't access cross-domain URLs.

Modified:
    incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
    incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java
    incubator/tuscany/java/sca/tutorial/store/store.composite

Modified: 
incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml?rev=609100&r1=609099&r2=609100&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml 
(original)
+++ incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml 
Sat Jan  5 00:23:53 2008
@@ -23,4 +23,5 @@
    <export.java package="services.merger"/>
    <export.java package="services.db"/>
    <import.java 
package="org.apache.tuscany.sca.implementation.data.collection"/>
+   <import.java package="org.apache.derby.*"/>
 </contribution>

Modified: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java?rev=609100&r1=609099&r2=609100&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java Sat Jan  
5 00:23:53 2008
@@ -54,7 +54,8 @@
         // the ejb component simply provides the meta data required to locate 
the 
         // EJB running in Geronimo
 //        catalogsNode.addToDomainLevelComposite(new QName("http://store";, 
"catalog-jee"));
-        catalogsNode.start();
+        //FIXME looks like we can't start/stop individual nodes anymore
+        //catalogsNode.start();
         System.out.println("catalogs.composite ready for big business !!!");
         
         SCANode currencyNode = 
nodeFactory.createSCANode("http://localhost:8300/cloud";, 
"http://localhost:9998";);
@@ -63,8 +64,12 @@
         currencyNode.addContribution("http://assets";, assetsContribution);
         currencyNode.addContribution("http://cloud";, cloudContribution);
         currencyNode.addToDomainLevelComposite(new QName("http://cloud";, 
"currency"));
-        currencyNode.start();
-        System.out.println("currency.composite ready for big business !!!");   
 
+        //FIXME looks like we can't start/stop individual nodes anymore
+        //currencyNode.start();
+        System.out.println("currency.composite ready for big business !!!");
+        
+        //FIXME looks like we can't start/stop individual nodes anymore
+        catalogsNode.getDomain().start();
      
         System.in.read();
         System.out.println("Stopping ...");

Modified: incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java?rev=609100&r1=609099&r2=609100&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java (original)
+++ incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java Sat Jan  
5 00:23:53 2008
@@ -45,7 +45,7 @@
         node.addContribution("http://store";, storeContribution);
         
         node.addToDomainLevelComposite(new QName("http://store";, "store"));
-        node.start();
+        node.getDomain().start();
 
         System.out.println("store.composite ready for big business !!!");
         System.in.read();

Modified: incubator/tuscany/java/sca/tutorial/store/store.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/store.composite?rev=609100&r1=609099&r2=609100&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/store.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store/store.composite Sat Jan  5 
00:23:53 2008
@@ -42,7 +42,7 @@
                <implementation.java class="services.FruitsCatalogImpl"/> 
                <property name="currencyCode">USD</property>
                <service name="Catalog">
-                       <t:binding.jsonrpc/>
+                       <t:binding.jsonrpc uri="http://localhost:8100/Catalog"/>
                </service>
                <reference name="currencyConverter" 
target="CurrencyConverter"/>        
        </component> 
@@ -50,10 +50,10 @@
        <component name="ShoppingCart">
                <implementation.java class="services.ShoppingCartImpl"/>
                <service name="Cart">
-                       <t:binding.atom/>
+                       <t:binding.atom 
uri="http://localhost:8100/ShoppingCart/Cart"/>
                </service>      
                <service name="Total">
-                       <t:binding.jsonrpc/>
+                       <t:binding.jsonrpc 
uri="http://localhost:8100/ShoppingCart/Total"/>
                </service>      
        </component>
     



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

Reply via email to