summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-17 06:22:44 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-17 06:22:44 +0000
commit8e4a90d2f486e4e62b45e3085448f82e056c0300 (patch)
tree24210eb9f4a658c021266efb684410db462718d3 /java/sca
parentc40ade3c51fffbe23ca390599c056206e0f5fd5b (diff)
Updating store sample webapp to the latest OASIS namespace/packages
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@881167 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/samples/store-webapp/pom.xml28
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/Cart.java2
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/Catalog.java2
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/CurrencyConverter.java2
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java6
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java4
-rw-r--r--java/sca/samples/store-webapp/src/main/java/services/Total.java2
-rw-r--r--java/sca/samples/store-webapp/src/main/resources/store.composite18
8 files changed, 32 insertions, 32 deletions
diff --git a/java/sca/samples/store-webapp/pom.xml b/java/sca/samples/store-webapp/pom.xml
index 8b6f0412f1..b9bb4af45b 100644
--- a/java/sca/samples/store-webapp/pom.xml
+++ b/java/sca/samples/store-webapp/pom.xml
@@ -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-webapp</artifactId>
@@ -40,55 +40,55 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <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>
@@ -107,7 +107,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<executions>
<execution>
<configuration>
diff --git a/java/sca/samples/store-webapp/src/main/java/services/Cart.java b/java/sca/samples/store-webapp/src/main/java/services/Cart.java
index 9e6226d963..3fb5439bc3 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/Cart.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/Cart.java
@@ -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> {
diff --git a/java/sca/samples/store-webapp/src/main/java/services/Catalog.java b/java/sca/samples/store-webapp/src/main/java/services/Catalog.java
index 2c3b19f579..b5e504fe11 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/Catalog.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/Catalog.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Catalog {
diff --git a/java/sca/samples/store-webapp/src/main/java/services/CurrencyConverter.java b/java/sca/samples/store-webapp/src/main/java/services/CurrencyConverter.java
index e104a0423a..a064f3dd69 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/CurrencyConverter.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface CurrencyConverter {
diff --git a/java/sca/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java b/java/sca/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..d132a24b00 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
@@ -22,9 +22,9 @@ package services;
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 {
diff --git a/java/sca/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java b/java/sca/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..698614212d 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
@@ -27,8 +27,8 @@ import java.util.UUID;
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 {
diff --git a/java/sca/samples/store-webapp/src/main/java/services/Total.java b/java/sca/samples/store-webapp/src/main/java/services/Total.java
index 8f464e526f..b77cc1c7ac 100644
--- a/java/sca/samples/store-webapp/src/main/java/services/Total.java
+++ b/java/sca/samples/store-webapp/src/main/java/services/Total.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Total {
diff --git a/java/sca/samples/store-webapp/src/main/resources/store.composite b/java/sca/samples/store-webapp/src/main/resources/store.composite
index 9c25783c0f..2fa6f93b39 100644
--- a/java/sca/samples/store-webapp/src/main/resources/store.composite
+++ b/java/sca/samples/store-webapp/src/main/resources/store.composite
@@ -17,21 +17,21 @@
* 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="store.html"/>
+ <tuscany:implementation.widget location="store.html"/>
<reference name="catalog" target="Catalog">
- <t:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Catalog"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Catalog"/>
</reference>
<reference name="shoppingCart" target="ShoppingCart/Cart">
- <t:binding.atom uri="http://localhost:8080/sample-store-webapp/ShoppingCart/Cart"/>
+ <tuscany:binding.atom uri="http://localhost:8080/sample-store-webapp/ShoppingCart/Cart"/>
</reference>
<reference name="shoppingTotal" target="ShoppingCart/Total">
- <t:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Total"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Total"/>
</reference>
</component>
@@ -39,7 +39,7 @@
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
- <t:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Catalog"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Catalog"/>
</service>
<reference name="currencyConverter" target="CurrencyConverter"/>
</component>
@@ -47,10 +47,10 @@
<component name="ShoppingCart">
<implementation.java class="services.ShoppingCartImpl"/>
<service name="Cart">
- <t:binding.atom uri="http://localhost:8080/sample-store-webapp/ShoppingCart/Cart"/>
+ <tuscany:binding.atom uri="http://localhost:8080/sample-store-webapp/ShoppingCart/Cart"/>
</service>
<service name="Total">
- <t:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Total"/>
+ <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-store-webapp/Total"/>
</service>
</component>