tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r830361 - in /tuscany/sandbox/sca-cloud-tutorial: ./ cloud-api/META-INF/ cloud-google/ cloud-google/META-INF/ store-appengine-webapp/ store-appengine-webapp/.settings/ store-appengine-webapp/src/ store-appengine-webapp/src/services/ store-a...
Date Tue, 27 Oct 2009 22:09:20 GMT
Author: lresende
Date: Tue Oct 27 22:09:18 2009
New Revision: 830361

URL: http://svn.apache.org/viewvc?rev=830361&view=rev
Log:
Refactoring common artifacts to store-assets module

Added:
    tuscany/sandbox/sca-cloud-tutorial/store-assets/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF
    tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml   (with props)
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java   (contents,
props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java  
(contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java   (contents,
props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java   (contents,
props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
  (contents, props changed)
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/
    tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml
      - copied, changed from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
Removed:
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/
Modified:
    tuscany/sandbox/sca-cloud-tutorial/cloud-api/META-INF/MANIFEST.MF
    tuscany/sandbox/sca-cloud-tutorial/cloud-google/META-INF/MANIFEST.MF
    tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
    tuscany/sandbox/sca-cloud-tutorial/pom.xml
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.classpath
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.settings/com.google.appengine.eclipse.core.prefs
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
    tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/catalog.composite
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html
    tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/pom.xml

Modified: tuscany/sandbox/sca-cloud-tutorial/cloud-api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/cloud-api/META-INF/MANIFEST.MF?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/cloud-api/META-INF/MANIFEST.MF (original)
+++ tuscany/sandbox/sca-cloud-tutorial/cloud-api/META-INF/MANIFEST.MF Tue Oct 27 22:09:18
2009
@@ -11,9 +11,9 @@
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Cloud API
-Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0",org.ap
- ache.tuscany.sca.cloud.user;version="2.0",org.apache.tuscany.sca.data
- .collection;version="2.0"
+Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0.0",org.ap
+ ache.tuscany.sca.cloud.user;version="2.0.0",org.apache.tuscany.sca.data
+ .collection;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.cloud.api
 Bundle-DocURL: http://www.apache.org/
 

Modified: tuscany/sandbox/sca-cloud-tutorial/cloud-google/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/cloud-google/META-INF/MANIFEST.MF?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/cloud-google/META-INF/MANIFEST.MF (original)
+++ tuscany/sandbox/sca-cloud-tutorial/cloud-google/META-INF/MANIFEST.MF Tue Oct 27 22:09:18
2009
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.cloud.data.impl
+Export-Package: org.apache.tuscany.sca.cloud.data.impl,
+ org.apache.tuscany.sca.cloud.user.impl
 Tool: Bnd-0.0.357
 Bundle-Name: Apache Tuscany SCA Cloud API - Google Implementation
 Created-By: 1.6.0_15 (Apple Inc.)
@@ -9,9 +10,9 @@
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Cloud API
-Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0",org.ap
- ache.tuscany.sca.cloud.user;version="2.0",org.apache.tuscany.sca.data
- .collection;version="2.0"
+Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0.0",org.ap
+ ache.tuscany.sca.cloud.user;version="2.0.0",org.apache.tuscany.sca.data
+ .collection;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.cloud.google
 Bundle-DocURL: http://www.apache.org/
 

Modified: tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml Tue Oct 27 22:09:18 2009
@@ -75,21 +75,6 @@
 	
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-
-				<configuration>
-					<instructions>
-						<Bundle-Version>2.0.0</Bundle-Version>
-						<Bundle-SymbolicName>org.apache.tuscany.sca.cloud.api.google</Bundle-SymbolicName>
-						<Bundle-Description>${pom.name}</Bundle-Description>
-						<Export-Package>org.apache.tuscany.sca.cloud*</Export-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>

Modified: tuscany/sandbox/sca-cloud-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/pom.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/pom.xml Tue Oct 27 22:09:18 2009
@@ -16,7 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.    
---><project>
+-->
+
+<project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
@@ -31,6 +33,7 @@
     <modules>
         <module>cloud-api</module>
         <module>cloud-google</module>
+        <module>store-assets</module>
     </modules>
     
 </project>
\ No newline at end of file

Modified: tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.classpath
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.classpath?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.classpath (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.classpath Tue Oct 27 22:09:18
2009
@@ -3,9 +3,10 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-cloud-api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-cloud-google"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/tuscany-data-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/store-assets"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>

Modified: tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.settings/com.google.appengine.eclipse.core.prefs
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.settings/com.google.appengine.eclipse.core.prefs?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.settings/com.google.appengine.eclipse.core.prefs
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/.settings/com.google.appengine.eclipse.core.prefs
Tue Oct 27 22:09:18 2009
@@ -1,4 +1,4 @@
-#Sun Oct 18 17:07:56 PDT 2009
+#Mon Oct 26 17:06:08 PDT 2009
 eclipse.preferences.version=1
 filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.2.6.jar|appengine-api-labs-1.2.6.jar|datanucleus-appengine-1.0.3.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
 ormEnhancementInclusions=

Modified: tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml Tue Oct 27 22:09:18
2009
@@ -29,63 +29,70 @@
     <packaging>war</packaging>
     <name>Apache Tuscany Store</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-google</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-      <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-      <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-            <exclusions>
-               <exclusion>
-                   <groupId>org.apache.tuscany.sca</groupId>
-                   <artifactId>tuscany-databinding-jaxb</artifactId>        
      
-               </exclusion>
-               <exclusion>
-                   <groupId>org.apache.tuscany.sca</groupId>
-                   <artifactId>tuscany-interface-java-jaxws</artifactId>    
          
-               </exclusion>
-            </exclusions>            
-        </dependency>                            
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>store-assets</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-sca-api</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-cloud-api</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-cloud-google</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-host-webapp</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<scope>runtime</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tuscany.sca</groupId>
+					<artifactId>tuscany-databinding-jaxb</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tuscany.sca</groupId>
+					<artifactId>tuscany-interface-java-jaxws</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
     
     <build>
        <finalName>${artifactId}</finalName>

Modified: tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite Tue Oct
27 22:09:18 2009
@@ -32,7 +32,7 @@
 		</service>
 		<reference name="fruitsCatalog">
 		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="http://tuscany-store-catalog.appspot.com/catalog"/>
+			<tuscany:binding.jsonrpc uri="http://tuscany-store-catalog.appspot.com/Catalog"/>
 		</reference>
 		<reference name="vegetablesCatalog">
 		    <interface.java interface="services.Catalog"/>
@@ -54,14 +54,14 @@
 			<tuscany:binding.jsonrpc uri="/ShoppingCart"/>
 		</service>
 		<reference name="userService" target="UserService">
-			<binding.sca/>
+			<binding.sca name="local"/>
 		</reference>
 	</component>
 	
 	<component name="UserService">
 		<implementation.java class="org.apache.tuscany.sca.cloud.user.impl.GoogleUserService"/>
 		<service name="UserService">
-			<binding.sca/>
+			<binding.sca name="local"/>
 			<tuscany:binding.jsonrpc uri="/User"/>
 		</service>
 	</component>	

Modified: tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
Tue Oct 27 22:09:18 2009
@@ -18,7 +18,9 @@
     * under the License.    
 -->
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-              xmlns:store="http://store">
-              
-      <deployable composite="store:catalog"/>
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" 
+	xmlns:store="http://store">
+
+	<deployable composite="store:catalog" />
+	<!-- import.java package="services" / -->
 </contribution>
\ No newline at end of file

Added: tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF?rev=830361&view=auto
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF (added)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF Tue Oct 27 22:09:18
2009
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Export-Package: services
+Tool: Bnd-0.0.357
+Bundle-Name: Apache Tuscany SCA Cloud Store Tutorial Assets
+Created-By: 1.6.0_15 (Apple Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1256186081729
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Cloud API
+Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0.0",
+ org.apache.tuscany.sca.cloud.user;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ services
+Bundle-SymbolicName: org.apache.tuscany.sca.store.assets
+Bundle-DocURL: http://www.apache.org/
+

Added: tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml?rev=830361&view=auto
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml (added)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml Tue Oct 27 22:09:18 2009
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>store-assets</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <name>Apache Tuscany SCA Cloud store common assets</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-cloud-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-cloud-google</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    
+</project>

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java (from
r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java (from
r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
Tue Oct 27 22:09:18 2009
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.logging.Logger;
 
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
@@ -31,7 +32,9 @@
 
 @Scope("COMPOSITE")
 public class ShoppingCartImpl implements ShoppingCart {
-    
+    private static final Logger log = Logger.getLogger(ShoppingCartImpl.class.getName());
+
+    //private DatastoreDocumentServiceImpl cart = new DatastoreDocumentServiceImpl(); 
     private Map<String, Item> cart = new HashMap<String, Item>();
 
     public Entry<String, Item>[] getAll() {

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
Tue Oct 27 22:09:18 2009
@@ -101,17 +101,14 @@
         if(userId == null || userId.length() == 0) {
             userId = ANONYMOUS;
         }
-        log.warning("Using userId:" + userId);
         return userId;
     }
     private String getCartKey() {
         String cartKey = "cart-" + this.getUserId();
-        log.warning("Using cartKey:" + cartKey);
         return cartKey;
     }
     private String generateItemKey() {
         String itemKey = getCartKey() + "-item-" + UUID.randomUUID().toString();
-        log.warning("Using itemKey:" + itemKey);
         return itemKey;
     }
 }

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
    (empty)

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java&p1=tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
Tue Oct 27 22:09:18 2009
@@ -40,7 +40,7 @@
     public void init() {
         String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
         catalog.add(new Item("Broccoli",  currencySymbol + currencyConverter.getConversion("USD",
currencyCode, 2.99)));
-        catalog.add(new Item("Aspargus", currencySymbol + currencyConverter.getConversion("USD",
currencyCode, 3.55)));
+        catalog.add(new Item("Asparagus", currencySymbol + currencyConverter.getConversion("USD",
currencyCode, 3.55)));
         catalog.add(new Item("Cauliflower", currencySymbol + currencyConverter.getConversion("USD",
currencyCode, 1.55)));
     }
 

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml
(from r829709, tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml&r1=829709&r2=830361&rev=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/META-INF/sca-contribution.xml
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml
Tue Oct 27 22:09:18 2009
@@ -18,7 +18,8 @@
     * under the License.    
 -->
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-              xmlns:store="http://store">
-              
-      <deployable composite="store:catalog"/>
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" 
+	xmlns:store="http://store">
+
+	<export.java package="services" />
 </contribution>
\ No newline at end of file

Modified: tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml Tue Oct 27 22:09:18
2009
@@ -30,6 +30,12 @@
     <name>Apache Tuscany Store Catalog Service</name>
 
     <dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>store-assets</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+		    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>

Modified: tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/catalog.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/catalog.composite?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/catalog.composite
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/catalog.composite
Tue Oct 27 22:09:18 2009
@@ -28,7 +28,7 @@
 		<property name="currencyCode">USD</property>
 		<service name="Catalog">
 		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="/catalog"/>
+			<tuscany:binding.jsonrpc uri="/Catalog"/>
 		</service>
 		<reference name="currencyConverter" target="CurrencyConverter" />
 	</component>

Modified: tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
(original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
Tue Oct 27 22:09:18 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 	<application>tuscany-store-catalog</application>
-	<version>1</version>
+	<version>2</version>
 	
 	<!-- Configure java.util.logging -->
 	<system-properties>

Modified: tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/war/index.html Tue Oct
27 22:09:18 2009
@@ -28,6 +28,6 @@
 <h2>Tuscany Store Catalog Service</h2>
 </br>
 </br>
-Catalog Service Definition available at : <a href="http://tuscany-store-catalog.appspot.com/catalog?smd">http://tuscany-store-catalog.appspot.com/catalog?smd</a>
+Catalog Service Definition available at : <a href="http://tuscany-store-catalog.appspot.com/Catalog?smd">http://tuscany-store-catalog.appspot.com/Catalog?smd</a>
 </body>
 </html>
\ No newline at end of file

Modified: tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/pom.xml?rev=830361&r1=830360&r2=830361&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/pom.xml Tue Oct 27
22:09:18 2009
@@ -30,6 +30,12 @@
     <name>Apache Tuscany SCA Store Catalog as WebApp</name>
 
     <dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>store-assets</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+		    
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
@@ -57,6 +63,13 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.04</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>



Mime
View raw message