Author: lresende
Date: Tue Nov 17 06:21:41 2009
New Revision: 881166
URL: http://svn.apache.org/viewvc?rev=881166&view=rev
Log:
Updating store sample application to the latest OASIS namespace/packages and
updating the launcher to use 2.x Node
Modified:
tuscany/java/sca/samples/store/pom.xml
tuscany/java/sca/samples/store/src/main/java/launch/Launch.java
tuscany/java/sca/samples/store/src/main/java/services/Cart.java
tuscany/java/sca/samples/store/src/main/java/services/Catalog.java
tuscany/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
tuscany/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
tuscany/java/sca/samples/store/src/main/java/services/Item.java
tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
tuscany/java/sca/samples/store/src/main/java/services/Total.java
tuscany/java/sca/samples/store/src/main/resources/store.composite
Modified: tuscany/java/sca/samples/store/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/pom.xml?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/pom.xml (original)
+++ tuscany/java/sca/samples/store/pom.xml Tue Nov 17 06:21:41 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>sample-store</artifactId>
@@ -38,70 +38,69 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-abdera</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-binding-atom-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-js</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-binding-atom-js-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-js</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -111,7 +110,6 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: tuscany/java/sca/samples/store/src/main/java/launch/Launch.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/launch/Launch.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/launch/Launch.java (original)
+++ tuscany/java/sca/samples/store/src/main/java/launch/Launch.java Tue Nov 17
06:21:41 2009
@@ -19,16 +19,21 @@
package launch;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class Launch {
public static void main(String[] args) throws Exception {
System.out.println("Starting ...");
- SCADomain scaDomain = SCADomain.newInstance("store.composite");
+ String contribution =
ContributionLocationHelper.getContributionLocation(Launch.class);
+ Node node = NodeFactory.newInstance().createNode("store.composite",
new Contribution("test", contribution));
System.out.println("store.composite ready for big business !!!");
System.in.read();
System.out.println("Stopping ...");
- scaDomain.close();
+ node.stop();
+ node.destroy();
System.out.println();
}
}
Modified: tuscany/java/sca/samples/store/src/main/java/services/Cart.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/Cart.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/services/Cart.java (original)
+++ tuscany/java/sca/samples/store/src/main/java/services/Cart.java Tue Nov 17
06:21:41 2009
@@ -20,7 +20,7 @@
package services;
import org.apache.tuscany.sca.data.collection.Collection;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Cart extends Collection<String, Item> {
Modified: tuscany/java/sca/samples/store/src/main/java/services/Catalog.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/Catalog.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/services/Catalog.java
(original)
+++ tuscany/java/sca/samples/store/src/main/java/services/Catalog.java Tue Nov
17 06:21:41 2009
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Catalog {
Modified:
tuscany/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/CurrencyConverter.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
---
tuscany/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
(original)
+++
tuscany/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
Tue Nov 17 06:21:41 2009
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface CurrencyConverter {
Modified:
tuscany/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
---
tuscany/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
(original)
+++
tuscany/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
Tue Nov 17 06:21:41 2009
@@ -22,9 +22,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
public class FruitsCatalogImpl implements Catalog {
Modified: tuscany/java/sca/samples/store/src/main/java/services/Item.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/Item.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/services/Item.java (original)
+++ tuscany/java/sca/samples/store/src/main/java/services/Item.java Tue Nov 17
06:21:41 2009
@@ -19,7 +19,6 @@
package services;
-
public class Item {
private String name;
private String price;
Modified:
tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
(original)
+++ tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
Tue Nov 17 06:21:41 2009
@@ -27,8 +27,8 @@
import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
@Scope("COMPOSITE")
public class ShoppingCartImpl implements Cart, Total {
Modified: tuscany/java/sca/samples/store/src/main/java/services/Total.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/java/services/Total.java?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/java/services/Total.java (original)
+++ tuscany/java/sca/samples/store/src/main/java/services/Total.java Tue Nov 17
06:21:41 2009
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Total {
Modified: tuscany/java/sca/samples/store/src/main/resources/store.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/store/src/main/resources/store.composite?rev=881166&r1=881165&r2=881166&view=diff
==============================================================================
--- tuscany/java/sca/samples/store/src/main/resources/store.composite (original)
+++ tuscany/java/sca/samples/store/src/main/resources/store.composite Tue Nov
17 06:21:41 2009
@@ -17,24 +17,24 @@
* 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";
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://store";
name="store">
<component name="Store">
- <t:implementation.widget location="uiservices/store.html"/>
+ <tuscany:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
- <t:binding.http uri="/store"/>
+ <tuscany:binding.http uri="/store"/>
</service>
<reference name="catalog" target="Catalog">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</reference>
<reference name="shoppingCart" target="ShoppingCart/Cart">
- <t:binding.atom/>
+ <tuscany:binding.atom/>
</reference>
<reference name="shoppingTotal" target="ShoppingCart/Total">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</reference>
</component>
@@ -42,7 +42,7 @@
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</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 uri="/ShoppingCart/Cart"/>
+ <tuscany:binding.atom uri="/ShoppingCart/Cart"/>
</service>
<service name="Total">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</service>
</component>
