incubator-nuvem-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r981146 - in /incubator/nuvem/trunk: ./ nuvem-api/ nuvem-api/META-INF/ nuvem-api/src/main/java/org/apache/nuvem/ nuvem-api/src/main/java/org/apache/nuvem/cloud/ nuvem-api/src/main/java/org/apache/nuvem/cloud/data/ nuvem-api/src/main/java/or...
Date Sun, 01 Aug 2010 04:31:00 GMT
Author: lresende
Date: Sun Aug  1 04:30:58 2010
New Revision: 981146

URL: http://svn.apache.org/viewvc?rev=981146&view=rev
Log:
Renaming modules, refactoring packages, etc

Added:
    incubator/nuvem/trunk/nuvem-api/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-api/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-api/src/main/java/org/apache/tuscany/sca/cloud/data/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-api/src/main/java/org/apache/tuscany/sca/cloud/user/
    incubator/nuvem/trunk/nuvem-google/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-google/
    incubator/nuvem/trunk/nuvem-google-appengine-sdk/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-appengine-sdk/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-google/src/main/java/org/apache/tuscany/sca/cloud/data/impl/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-google/src/main/java/org/apache/tuscany/sca/cloud/user/impl/
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-google/src/test/java/org/apache/tuscany/sca/cloud/data/impl/
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/cloud-google/src/test/resources/org/apache/tuscany/sca/cloud/data/impl/
    incubator/nuvem/trunk/store-appengine-webapp/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/store-appengine-webapp/
    incubator/nuvem/trunk/store-assets/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/store-assets/
    incubator/nuvem/trunk/store-catalog-appengine-webapp/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/store-catalog-appengine-webapp/
    incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/store-catalog-ibmcloud-webapp/
    incubator/nuvem/trunk/store-merger-appengine-webapp/
      - copied from r980286, incubator/nuvem/contrib/nuvem-initial-contribution/store-merger-appengine-webapp/
Removed:
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/tuscany/sca/cloud/data/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/tuscany/sca/cloud/user/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/tuscany/sca/cloud/data/impl/
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/tuscany/sca/cloud/user/impl/
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/tuscany/sca/cloud/data/impl/
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/tuscany/sca/cloud/data/impl/
Modified:
    incubator/nuvem/trunk/nuvem-api/META-INF/MANIFEST.MF
    incubator/nuvem/trunk/nuvem-api/pom.xml
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/DocumentService.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/User.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserContext.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserService.java
    incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml
    incubator/nuvem/trunk/nuvem-google-appengine-sdk/pom.xml
    incubator/nuvem/trunk/nuvem-google/META-INF/MANIFEST.MF
    incubator/nuvem/trunk/nuvem-google/pom.xml
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceImpl.java
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/MemcacheDocumentServiceImpl.java
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/GoogleUserService.java
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/Customer.java
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceTestCase.java
    incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/datastore.composite
    incubator/nuvem/trunk/pom.xml
    incubator/nuvem/trunk/store-appengine-webapp/pom.xml
    incubator/nuvem/trunk/store-appengine-webapp/war/store.composite
    incubator/nuvem/trunk/store-appengine-webapp/war/store.html
    incubator/nuvem/trunk/store-assets/META-INF/MANIFEST.MF
    incubator/nuvem/trunk/store-assets/pom.xml
    incubator/nuvem/trunk/store-assets/src/main/java/services/ShoppingCartManager.java
    incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml
    incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/pom.xml
    incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml
    incubator/nuvem/trunk/store-merger-appengine-webapp/war/store.composite

Modified: incubator/nuvem/trunk/nuvem-api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/META-INF/MANIFEST.MF?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/META-INF/MANIFEST.MF (original)
+++ incubator/nuvem/trunk/nuvem-api/META-INF/MANIFEST.MF Sun Aug  1 04:30:58 2010
@@ -1,19 +1,18 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.cloud.user;version="2.0.0",org.
- apache.tuscany.sca.cloud.data;uses:="org.apache.tuscany.sca.data.coll
- ection";version="2.0.0"
+Export-Package: org.apache.nuvem.cloud.data;version="2.0.0";uses:="org.apache.tuscany.sca.data.collection",
+ org.apache.nuvem.cloud.user;version="2.0.0"
 Tool: Bnd-0.0.357
-Bundle-Name: Apache Tuscany SCA Cloud API
+Bundle-Name: Apache Nuvem Cloud API
 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.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-Description: Apache Nuvem Cloud API
+Import-Package: org.apache.nuvem.cloud.data;version="2.0.0",
+ org.apache.nuvem.cloud.user;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0"
+Bundle-SymbolicName: org.apache.nuvem.cloud.api
 Bundle-DocURL: http://www.apache.org/
 

Modified: incubator/nuvem/trunk/nuvem-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-api/pom.xml Sun Aug  1 04:30:58 2010
@@ -22,29 +22,30 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-cloud-api</artifactId>
-    <name>Apache Tuscany SCA Cloud API</name>
+    <artifactId>nuvem-cloud-api</artifactId>
+    <version>1.0-incubating-SNAPSHOT</version>
+    <name>Apache Nuvem Cloud API</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-sca-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>${tuscany.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>${tuscany.version}</version>
 		</dependency>		
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.5</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/DocumentService.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/DocumentService.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/DocumentService.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/data/DocumentService.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.data;
+package org.apache.nuvem.cloud.data;
 
 import org.apache.tuscany.sca.data.collection.Collection;
 import org.apache.tuscany.sca.data.collection.NotFoundException;

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/User.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/User.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/User.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/User.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.user;
+package org.apache.nuvem.cloud.user;
 
 public class User {
     public static enum ROLES { UNDEFINED, USER, ADMIN};

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserContext.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserContext.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserContext.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserContext.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.user;
+package org.apache.nuvem.cloud.user;
 
 public class UserContext extends User {
     protected String loginUrl;

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserService.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserService.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserService.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/user/UserService.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.user;
+package org.apache.nuvem.cloud.user;
 
 import org.oasisopen.sca.annotation.Remotable;
 

Modified: incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml (original)
+++ incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml Sun Aug  1 04:30:58 2010
@@ -20,7 +20,7 @@
 <project name="AppEngineSDKInstaller">
 	
 
-    <property name="appengine.version" value="1.2.6"/>
+    <property name="appengine.version" value="1.3.1"/>
 	<property name="appengine.distribution.location" value="http://googleappengine.googlecode.com/files/appengine-java-sdk-${appengine.version}.zip" />
     <property name="unpack.location" value="${basedir}/target/appengine-java-sdk-${appengine.version}"/>
 	

Modified: incubator/nuvem/trunk/nuvem-google-appengine-sdk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google-appengine-sdk/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google-appengine-sdk/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google-appengine-sdk/pom.xml Sun Aug  1 04:30:58 2010
@@ -22,14 +22,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-cloud-appengine-sdk</artifactId>
+    <artifactId>nuvem-cloud-google-appengine-sdk</artifactId>
+    <version>1.0-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Cloud API Google AppEngine SDK</name>
+    <name>Apache Nuvem Cloud API Google AppEngine SDK</name>
 	
 	<build>
 		<plugins>

Modified: incubator/nuvem/trunk/nuvem-google/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/META-INF/MANIFEST.MF?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/META-INF/MANIFEST.MF (original)
+++ incubator/nuvem/trunk/nuvem-google/META-INF/MANIFEST.MF Sun Aug  1 04:30:58 2010
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.cloud.data.impl,
- org.apache.tuscany.sca.cloud.user.impl
+Export-Package: org.apache.nuvem.cloud.data.impl,
+ org.apache.nuvem.cloud.user.impl
 Tool: Bnd-0.0.357
-Bundle-Name: Apache Tuscany SCA Cloud API - Google Implementation
+Bundle-Name: Apache Nuvem Cloud API - Google Implementation
 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.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-Description: Apache Nuvem Cloud API
+Import-Package: org.apache.nuvem.cloud.data;version="2.0.0",
+ org.apache.nuvem.cloud.user;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0"
+Bundle-SymbolicName: org.apache.nuvem.cloud.google
 Bundle-DocURL: http://www.apache.org/
 

Modified: incubator/nuvem/trunk/nuvem-google/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/pom.xml Sun Aug  1 04:30:58 2010
@@ -22,46 +22,47 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-cloud-google</artifactId>
-    <name>Apache Tuscany SCA Cloud API Google AppEngine Implementation</name>
+    <artifactId>nuvem-cloud-google</artifactId>
+	<version>1.0-incubating-SNAPSHOT</version>
+    <name>Apache Nuvem Cloud API Implementation for Google AppEngine</name>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-cloud-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.nuvem</groupId>
+			<artifactId>nuvem-cloud-api</artifactId>
+			<version>${pom.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-cloud-appengine-sdk</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.nuvem</groupId>
+			<artifactId>nuvem-cloud-google-appengine-sdk</artifactId>
+			<version>${pom.version}</version>
 			<type>pom</type>
 		</dependency>
 		
 		<dependency>
 			<groupId>com.google.appengine</groupId>
 			<artifactId>appengine-api</artifactId>
-			<version>1.2.6</version>
+			<version>1.3.1</version>
 			<scope>provided</scope>
 		</dependency>		
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>test</scope>
         </dependency>
         		
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.5</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceImpl.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceImpl.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceImpl.java Sun Aug  1 04:30:58 2010
@@ -17,11 +17,11 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.data.impl;
+package org.apache.nuvem.cloud.data.impl;
 
 import java.util.UUID;
 
-import org.apache.tuscany.sca.cloud.data.DocumentService;
+import org.apache.nuvem.cloud.data.DocumentService;
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.oasisopen.sca.annotation.Init;

Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/MemcacheDocumentServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/MemcacheDocumentServiceImpl.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/MemcacheDocumentServiceImpl.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/data/impl/MemcacheDocumentServiceImpl.java Sun Aug  1 04:30:58 2010
@@ -17,11 +17,11 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.data.impl;
+package org.apache.nuvem.cloud.data.impl;
 
 import java.util.UUID;
 
-import org.apache.tuscany.sca.cloud.data.DocumentService;
+import org.apache.nuvem.cloud.data.DocumentService;
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.oasisopen.sca.annotation.Init;

Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/GoogleUserService.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/GoogleUserService.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/GoogleUserService.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/user/impl/GoogleUserService.java Sun Aug  1 04:30:58 2010
@@ -17,11 +17,11 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.user.impl;
+package org.apache.nuvem.cloud.user.impl;
 
-import org.apache.tuscany.sca.cloud.user.User;
-import org.apache.tuscany.sca.cloud.user.UserContext;
-import org.apache.tuscany.sca.cloud.user.UserService;
+import org.apache.nuvem.cloud.user.User;
+import org.apache.nuvem.cloud.user.UserContext;
+import org.apache.nuvem.cloud.user.UserService;
 import org.oasisopen.sca.annotation.Init;
 import org.oasisopen.sca.annotation.Scope;
 import org.oasisopen.sca.annotation.Service;

Modified: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/Customer.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/Customer.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/Customer.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/Customer.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.data.impl;
+package org.apache.nuvem.cloud.data.impl;
 
 import java.io.Serializable;
 

Modified: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceTestCase.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceTestCase.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/data/impl/DatastoreDocumentServiceTestCase.java Sun Aug  1 04:30:58 2010
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.cloud.data.impl;
+package org.apache.nuvem.cloud.data.impl;
 
 import org.junit.Ignore;
 

Modified: incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/datastore.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/datastore.composite?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/datastore.composite (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/resources/org/apache/nuvem/cloud/data/impl/datastore.composite Sun Aug  1 04:30:58 2010
@@ -23,7 +23,7 @@
     name="datastore">
 
     <component name="DataStoreDocumentServiceComponent">
-        <implementation.java class="org.apache.tuscany.sca.cloud.data.impl.DatastoreDocumentServiceImpl"/>
+        <implementation.java class="org.apache.nuvem.cloud.data.impl.DatastoreDocumentServiceImpl"/>
     </component>    
     
 </composite>

Modified: incubator/nuvem/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/pom.xml?rev=981146&r1=981145&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/pom.xml (original)
+++ incubator/nuvem/trunk/pom.xml Sun Aug  1 04:30:58 2010
@@ -28,7 +28,7 @@
     <!-- Project description and basic configuration                            -->
     <!-- ====================================================================== -->
     <groupId>org.apache.nuvem</groupId>
-    <artifactId>nuvem-parent</artifactId>
+    <artifactId>nuvem</artifactId>
     <version>1.0-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Nuvem</name>
@@ -186,20 +186,29 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-
+                <module>nuvem-api</module>
+                <module>nuvem-google</module>
+                <module>nuvem-google-appengine-sdk</module>                
+                <module>store-assets</module>
+                <module>store-appengine-webapp</module>
+                <module>store-merger-appengine-webapp</module>                
+                <module>store-catalog-appengine-webapp</module>
+                <module>store-catalog-ibmcloud-webapp</module>
             </modules>
         </profile>
 
         <!-- ====================================================================== -->
-        <!-- Profile to build release distribution                                  -->
+        <!-- Profile to build eclipse ide project files                             -->
         <!-- ====================================================================== -->
         <profile>
-            <id>distribution</id>
+            <id>eclipse</id>
             <modules>
-
+                <module>nuvem-api</module>
+                <module>store-assets</module>
+                <module>store-catalog-ibmcloud-webapp</module>
             </modules>
         </profile>
-
+        
         <!-- ====================================================================== -->
         <!-- Profile to run Apache License check plugin                             -->
         <!-- usage:                                                                 -->
@@ -322,7 +331,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>2.3.1</version>
                     <configuration>
                         <source>1.6</source>
                         <target>1.6</target>
@@ -333,7 +342,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>2.5</version>
                     <configuration>
                         <includes>
                             <include>**/*TestCase.java</include>
@@ -349,7 +358,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.3.1</version>
                     <configuration>
                         <archive>
                             <manifestEntries>
@@ -370,6 +379,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clover-plugin</artifactId>
+                    <version>2.4</version>
                     <configuration>
                         <jdk>1.6</jdk>
                     </configuration>

Modified: incubator/nuvem/trunk/store-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-appengine-webapp/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-appengine-webapp/pom.xml Sun Aug  1 04:30:58 2010
@@ -20,58 +20,59 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>store-appengine-webapp</artifactId>
+	<version>1.0-incubating-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Apache Tuscany Store</name>
+    <name>Apache Nuvem Cloud Store Scenario</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
+            <groupId>org.apache.nuvem</groupId>
             <artifactId>store-assets</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-api</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-google</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-google</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>${tuscany.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
@@ -212,5 +213,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

Modified: incubator/nuvem/trunk/store-appengine-webapp/war/store.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-appengine-webapp/war/store.composite?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-appengine-webapp/war/store.composite (original)
+++ incubator/nuvem/trunk/store-appengine-webapp/war/store.composite Sun Aug  1 04:30:58 2010
@@ -51,7 +51,7 @@
 	</component>
 	
 	<component name="UserService">
-		<implementation.java class="org.apache.tuscany.sca.cloud.user.impl.GoogleUserService"/>
+		<implementation.java class="org.apache.nuvem.cloud.user.impl.GoogleUserService"/>
 		<service name="UserService">
 			<binding.sca name="local"/>
 			<tuscany:binding.jsonrpc uri="/User"/>

Modified: incubator/nuvem/trunk/store-appengine-webapp/war/store.html
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-appengine-webapp/war/store.html?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-appengine-webapp/war/store.html (original)
+++ incubator/nuvem/trunk/store-appengine-webapp/war/store.html Sun Aug  1 04:30:58 2010
@@ -6,20 +6,20 @@
     * 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.    
+    * under the License.
 -->
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Online Store - Powered by Apache Tuscany</title>
+<title>Online Store - Powered by Apache Nuvem</title>
 
 <link href="store.css" rel="stylesheet" type="text/css">
 
@@ -32,13 +32,13 @@
 <script language="JavaScript">
 
 	var userServices = new dojo.rpc.JsonService("/User?smd");
-	
+
 	var catalog = new dojo.rpc.JsonService("/Catalog?smd");
 
 	var shoppingCart = new dojo.rpc.JsonService("/ShoppingCart?smd");
 
 	var userContext;
-	
+
 	var catalogItems;
 
 	function showHeader() {
@@ -54,24 +54,24 @@
 			}
 
 			document.getElementById('appHeader').innerHTML = html;
-		}		
-			
+		}
+
 		userServices.getUserContext(document.URL, "").addCallback(userContextCallback);
 	}
-	
+
 	function showCatalogs() {
 		var catalogCallback = function(items) {
 			var catalog = "";
 			for (var i=0; i<items.length; i++) {
 				var item = items[i].name + ' - ' + items[i].currencySymbol + items[i].price;
-				catalog += '<input name="items" type="checkbox" value="' + 
+				catalog += '<input name="items" type="checkbox" value="' +
 							item + '">' + item + ' <br>';
 			}
 			document.getElementById('catalog').innerHTML=catalog;
 			catalogItems = items;
 		}
 
-		catalog.get().addCallback(catalogCallback); 
+		catalog.get().addCallback(catalogCallback);
 	}
 
 
@@ -90,7 +90,7 @@
 		}
 		document.getElementById("shoppingCart").innerHTML = list;
 
-		if (items.length != 0) {			
+		if (items.length != 0) {
 			try	{
 				shoppingCart.getTotal().addCallback(shoppingCart_getTotalResponse);
 			}
@@ -99,24 +99,24 @@
 			}
 		}
 	}
-	
+
 	function shoppingCart_getTotalResponse(total,exception) {
-		if(exception) { 
-			alert(exception.message); 
+		if(exception) {
+			alert(exception.message);
 			return;
 		}
 		document.getElementById('total').innerHTML = total;
 	}
-	
+
 	function shoppingCart_postResponse(entry) {
 		shoppingCart.getAll().addCallback(shoppingCart_getResponse);
-	}				
+	}
 
 	function addToCart() {
 		var items  = document.catalogForm.items;
 		var j = 0;
 		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {					
+			if (items[i].checked) {
 				shoppingCart.post("", catalogItems[i]).addCallback(shoppingCart_postResponse);
 				items[i].checked = false;
 			}
@@ -131,31 +131,31 @@
 					document.getElementById('total').innerHTML+
 					'<br>'+
 					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
+					'<input type="submit" value="Continue Shopping">'+
 				'</form>';
 		shoppingCart.delete("");
 	}
 	function deleteCart() {
 		shoppingCart.delete("");
 		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
+		document.getElementById('total').innerHTML = "";
+	}
+
 
-	
 
 	function init() {
 		try {
 			showHeader();
 
 			showCatalogs();
-			
+
 			shoppingCart.getAll().addCallback(shoppingCart_getResponse);
 		} catch (e) {
 			alert(e);
 		}
 	}
 
-	
+
 </script>
 
 </head>
@@ -165,8 +165,8 @@
    </div>
 
    <h1>Store</h1>
-   
-   
+
+
 
   <div id="store">
    	<h2>Catalog</h2>
@@ -175,19 +175,19 @@
         <br>
 		<input type="button" onClick="addToCart()"  value="Add to Cart">
    	</form>
- 
+
 
  	<br>
-  
+
    	<h2>Your Shopping Cart</h2>
    	<form name="shoppingCartForm">
 		<div id="shoppingCart"></div>
 		<br>
 		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
+		<br>
+		<input type="button" onClick="checkoutCart()" value="Checkout">
 		<input type="button" onClick="deleteCart()" value="Empty">
-	</form>        
+	</form>
   </div>
 </body>
 

Modified: incubator/nuvem/trunk/store-assets/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-assets/META-INF/MANIFEST.MF?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-assets/META-INF/MANIFEST.MF (original)
+++ incubator/nuvem/trunk/store-assets/META-INF/MANIFEST.MF Sun Aug  1 04:30:58 2010
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Export-Package: services
 Tool: Bnd-0.0.357
-Bundle-Name: Apache Tuscany SCA Cloud Store Tutorial Assets
+Bundle-Name: Apache Nuvem 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",
+Bundle-Description: Apache Nuvem Cloud API
+Import-Package: org.apache.nuvem.cloud.data;version="2.0.0",
+ org.apache.nuvem.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-SymbolicName: org.apache.nuvem.store.assets
 Bundle-DocURL: http://www.apache.org/
 

Modified: incubator/nuvem/trunk/store-assets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-assets/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-assets/pom.xml (original)
+++ incubator/nuvem/trunk/store-assets/pom.xml Sun Aug  1 04:30:58 2010
@@ -23,33 +23,33 @@
     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>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-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>
+    <version>1.0-incubating-SNAPSHOT</version>
+    <name>Apache Nuvem Cloud Store common assets</name>
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-api</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-		
+
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-google</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-google</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>${tuscany.version}</version>
+        </dependency>		
     </dependencies>
     
 </project>

Modified: incubator/nuvem/trunk/store-assets/src/main/java/services/ShoppingCartManager.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-assets/src/main/java/services/ShoppingCartManager.java?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-assets/src/main/java/services/ShoppingCartManager.java (original)
+++ incubator/nuvem/trunk/store-assets/src/main/java/services/ShoppingCartManager.java Sun Aug  1 04:30:58 2010
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
 
-import org.apache.tuscany.sca.cloud.user.User;
-import org.apache.tuscany.sca.cloud.user.UserService;
+import org.apache.nuvem.cloud.user.User;
+import org.apache.nuvem.cloud.user.UserService;
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.oasisopen.sca.annotation.Reference;

Modified: incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-catalog-appengine-webapp/pom.xml Sun Aug  1 04:30:58 2010
@@ -20,46 +20,47 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>store-catalog-appengine-webapp</artifactId>
+	<version>1.0-incubating-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Apache Tuscany Store Catalog Service</name>
+    <name>Apache Nuvem Cloud Store Catalog Service</name>
 
     <dependencies>
 		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
+			<groupId>org.apache.nuvem</groupId>
 			<artifactId>store-assets</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<version>${pom.version}</version>
 		</dependency>
 		    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
         </dependency>
 
       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
         
       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
             <exclusions>
                <exclusion>

Modified: incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-catalog-ibmcloud-webapp/pom.xml Sun Aug  1 04:30:58 2010
@@ -20,46 +20,47 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>store-catalog-ibmcloud-webapp</artifactId>
+	<version>1.0-incubating-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Apache Tuscany SCA Store Catalog as WebApp</name>
+    <name>Apache Nuvem Cloud Store Catalog for IBM Cloud</name>
 
     <dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>store-assets</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		    
+        <dependency>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>store-assets</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+		
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -69,42 +70,7 @@
             <version>1.3.04</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        -->
-    </dependencies>
-    
+    </dependencies>    
     
     <build>
        <finalName>${artifactId}</finalName>

Modified: incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/store-merger-appengine-webapp/pom.xml Sun Aug  1 04:30:58 2010
@@ -20,58 +20,59 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.nuvem</groupId>
+        <artifactId>nuvem-parent</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>store-merger-appengine-webapp</artifactId>
+	<version>1.0-incubating-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Apache Tuscany Store</name>
+    <name>Apache Nuvem Cloud Store Scenario for Google App Engine</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
+            <groupId>org.apache.nuvem</groupId>
             <artifactId>store-assets</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-api</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.apache.nuvem</groupId>
+            <artifactId>nuvem-cloud-google</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-cloud-google</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>${tuscany.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>${tuscany.version}</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>

Modified: incubator/nuvem/trunk/store-merger-appengine-webapp/war/store.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-merger-appengine-webapp/war/store.composite?rev=981146&r1=980286&r2=981146&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-merger-appengine-webapp/war/store.composite (original)
+++ incubator/nuvem/trunk/store-merger-appengine-webapp/war/store.composite Sun Aug  1 04:30:58 2010
@@ -59,7 +59,7 @@
 	</component>
 	
 	<component name="UserService">
-		<implementation.java class="org.apache.tuscany.sca.cloud.user.impl.GoogleUserService"/>
+		<implementation.java class="org.apache.nuvem.cloud.user.impl.GoogleUserService"/>
 		<service name="UserService">
 			<binding.sca name="local"/>
 			<tuscany:binding.jsonrpc uri="/User"/>



Mime
View raw message