You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by jo...@apache.org on 2011/06/02 17:07:37 UTC

svn commit: r1130656 - in /incubator/nuvem/trunk: ./ nuvem-google-appengine-sdk/ nuvem-google/ nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/ nuvem-google/src/main/resources/ nuvem-google/src/main/resources/META-INF/ nuvem-google/src/test...

Author: johnp
Date: Thu Jun  2 17:07:36 2011
New Revision: 1130656

URL: http://svn.apache.org/viewvc?rev=1130656&view=rev
Log:
-upgraded GAE to a latest version
-updated few pom to reflect parent/module relation
-corrected a failing testcase

Added:
    incubator/nuvem/trunk/nuvem-google/src/main/resources/
    incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/
    incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml
    incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite
Modified:
    incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml
    incubator/nuvem/trunk/nuvem-google/pom.xml
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java
    incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java
    incubator/nuvem/trunk/nuvem-samples/pom.xml
    incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/pom.xml
    incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/appengine-web.xml
    incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite
    incubator/nuvem/trunk/nuvem-standalone/src/main/resources/META-INF/sca-contribution.xml
    incubator/nuvem/trunk/nuvem-standalone/src/main/resources/nuvemxmpp.composite
    incubator/nuvem/trunk/nuvem-standalone/src/test/java/org/apache/nuvem/cloud/data/impl/MapDocumentServiceImplTestCase.java
    incubator/nuvem/trunk/pom.xml

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=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml (original)
+++ incubator/nuvem/trunk/nuvem-google-appengine-sdk/build-appengine.xml Thu Jun  2 17:07:36 2011
@@ -20,7 +20,7 @@
 <project name="AppEngineSDKInstaller">
 	
 
-    <property name="appengine.version" value="1.3.7"/>
+    <property name="appengine.version" value="1.5.0.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/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/pom.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/pom.xml Thu Jun  2 17:07:36 2011
@@ -20,6 +20,7 @@
 <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/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nuvem</groupId>
@@ -44,13 +45,34 @@
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>com.google.appengine</groupId>
 			<artifactId>appengine-api-1.0-sdk</artifactId>
-			<version>1.4.2</version>
+			<version>${gae.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		<dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-labs</artifactId>
+            <version>${gae.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-testing</artifactId>
+            <version>${gae.version}</version>
+            <scope>test</scope>
+        </dependency>
+		
+		<dependency>
+        	<groupId>com.google.appengine</groupId>
+        	<artifactId>appengine-api-stubs</artifactId>
+            <version>${gae.version}</version>
+        	<scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>net.sf.jsr107cache</groupId>
@@ -58,28 +80,12 @@
             <version>1.1</version>
         </dependency>
         
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
             <version>${tuscany.version}</version>
             <scope>test</scope>
         </dependency>
-        
-         <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-labs</artifactId>
-            <version>1.3.7</version>
-            <scope>test</scope>
-        </dependency>
-        
-        
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-testing</artifactId>
-            <version>1.3.7</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -107,12 +113,7 @@
     		<version>2.5</version>
     		<scope>provided</scope>
 		</dependency>
-        <dependency>
-        	<groupId>com.google.appengine</groupId>
-        	<artifactId>appengine-api-stubs</artifactId>
-        	<version>1.4.2</version>
-        	<scope>test</scope>
-        </dependency>
+
 	</dependencies>
 
 	<build>
@@ -121,7 +122,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <configuration>
-                    <excludes>
+                   <excludes>
                         <exclude>com.google.appengine:appengine-tools</exclude>
                         <exclude>com.google.appengine:appengine-api</exclude>
                         <exclude>com.google.appengine:appengine-local-runtime-shared</exclude>

Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java Thu Jun  2 17:07:36 2011
@@ -21,6 +21,7 @@ package org.apache.nuvem.cloud.xmpp.impl
 
 import java.io.IOException;
 
+import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,6 +29,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.commons.lang.StringUtils;
 import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
 import org.apache.nuvem.cloud.xmpp.message.MessageListener;
+import org.oasisopen.sca.ComponentContext;
 import org.oasisopen.sca.annotation.Reference;
 
 import com.google.appengine.api.xmpp.JID;
@@ -41,8 +43,8 @@ import com.google.appengine.api.xmpp.XMP
  * This servlet will recieve the messages posted in the HTTP POST request, parse
  * the message using the APIs provided by GAE convert the message into nuvem
  * specific message so that the
- * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)} will
- * be called for the <code>JID</code> the <code>MessageListener</code> is
+ * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)}
+ * will be called for the <code>JID</code> the <code>MessageListener</code> is
  * registered for.
  * </p>
  */
@@ -56,8 +58,24 @@ public class GoogleRecieverServlet exten
 	private XMPPEndPoint endPoint;
 
 	/**
+	 * If the servlet container doesnt support SCA then the endpoint will be
+	 * identified explicitly.
+	 */
+	@Override
+	public void init(ServletConfig config) {
+		if (endPoint == null) {
+			ComponentContext context = (ComponentContext) config
+					.getServletContext().getAttribute(
+							"org.osoa.sca.ComponentContext");
+			endPoint = context.getService(XMPPEndPoint.class,
+					"XMPPComponent/XMPPEndPoint");
+		}
+	}
+
+	/**
 	 * Adapts the HTTP Post request into a call to the
-	 * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)}.
+	 * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)}
+	 * .
 	 * 
 	 * @see org.apache.nuvem.cloud.xmpp.message.MessageListener
 	 * @see org.apache.nuvem.cloud.xmpp.XMPPEndPoint

Added: incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml?rev=1130656&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml (added)
+++ incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml Thu Jun  2 17:07:36 2011
@@ -0,0 +1,27 @@
+<?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.    
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" 
+	xmlns:google="http://nuvemgoogle">
+	<export namespace="http://nuvemgoogle" />
+	<export.java package="org.apache.nuvem.cloud.xmpp.client" />
+	
+	<deployable composite="google:xmpp" />
+</contribution>
\ No newline at end of file

Added: incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite?rev=1130656&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite (added)
+++ incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite Thu Jun  2 17:07:36 2011
@@ -0,0 +1,53 @@
+<?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.
+	-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+	targetNamespace="http://nuvemgoogle" name="xmpp">
+
+
+	<component name="XMPPComponent">
+		<implementation.java
+			class="org.apache.nuvem.cloud.xmpp.impl.GoogleXMPPEndPoint" />
+		<service name="XMPPEndPoint">
+			<interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPEndPoint" />
+		</service>
+		<reference name="connector" target="GoogleConnector/XMPPConnector">
+			<interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPConnector" />
+		</reference>
+		<reference name="presenceManager" target="PresenceComponent/PresenceManager">
+            <interface.java interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
+        </reference>
+	</component>
+
+	<component name="PresenceComponent">
+		<implementation.java
+			class="org.apache.nuvem.cloud.xmpp.impl.GooglePresenceManager" />
+		<service name="PresenceManager">
+			<interface.java interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
+		</service>
+		<reference name="connector" target="GoogleConnector/XMPPConnector">
+			<interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPConnector" />
+		</reference>
+	</component>
+	
+	<component name="GoogleConnector">
+		<implementation.java class="org.apache.nuvem.cloud.xmpp.impl.GoogleXMPPConnector" />
+		<service name="XMPPConnector">
+			<interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPConnector" />
+		</service>
+	</component>
+
+</composite>

Modified: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java Thu Jun  2 17:07:36 2011
@@ -19,6 +19,9 @@
 
 package org.apache.nuvem.cloud.xmpp.impl;
 
+import org.junit.Ignore;
+
+@Ignore
 public class GooglePresenceServletTestCase {
 	
 	

Modified: incubator/nuvem/trunk/nuvem-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/pom.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-samples/pom.xml Thu Jun  2 17:07:36 2011
@@ -27,4 +27,17 @@
 	<version>1.0-incubating-SNAPSHOT</version>
 	<name>Apache Nuvem Cloud Store common assets</name>
 	<packaging>pom</packaging>
+
+
+	
+	<modules>
+		<!-- Modules -->
+		<module>store-assets</module>
+		<module>store-appengine-webapp</module>
+		<module>store-catalog-appengine-webapp</module>
+		<module>store-catalog-ibmcloud-webapp</module>
+		<module>store-merger-appengine-webapp</module>
+		<module>store-standalone</module>
+	</modules>
+	
 </project>
\ No newline at end of file

Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/pom.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/pom.xml Thu Jun  2 17:07:36 2011
@@ -17,7 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<project>
+<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.nuvem</groupId>
@@ -197,7 +198,7 @@
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
-                        <phase>process-sources</phase>
+                        <phase>install</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>

Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/appengine-web.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/appengine-web.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/appengine-web.xml (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/appengine-web.xml Thu Jun  2 17:07:36 2011
@@ -18,8 +18,8 @@
   * under the License.
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-	<application>tuscany-store</application>
-	<version>7</version>
+	<application>nuvemstore</application>
+	<version>8</version>
 
 	<!-- Configure java.util.logging -->
 	<system-properties>

Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite Thu Jun  2 17:07:36 2011
@@ -67,6 +67,19 @@
 	<component name="XMPPEndpoint">
 		<implementation.java
 			class="org.apache.nuvem.cloud.xmpp.impl.GoogleXMPPEndPoint" />
+		<reference name="presenceManager" target="PresenceComponent/PresenceManager">
+			<interface.java
+				interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
+		</reference>
+	</component>
+
+	<component name="PresenceComponent">
+		<implementation.java
+			class="org.apache.nuvem.cloud.xmpp.impl.GooglePresenceManager" />
+		<service name="PresenceManager">
+			<interface.java
+				interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
+		</service>
 	</component>
 
 	<component name="ShipmentObserver">

Modified: incubator/nuvem/trunk/nuvem-standalone/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-standalone/src/main/resources/META-INF/sca-contribution.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-standalone/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/nuvem/trunk/nuvem-standalone/src/main/resources/META-INF/sca-contribution.xml Thu Jun  2 17:07:36 2011
@@ -19,7 +19,10 @@
 -->
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" 
-	xmlns:xmpp="http://nuvemxmpp">
+	xmlns:standalone="http://nuvemstandalone">
 
+	<export namespace="http://nuvemstandalone" />
 	<export.java package="org.apache.nuvem.cloud.xmpp.client" />
+	
+	<deployable composite="standalone:xmpp" />
 </contribution>
\ No newline at end of file

Modified: incubator/nuvem/trunk/nuvem-standalone/src/main/resources/nuvemxmpp.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-standalone/src/main/resources/nuvemxmpp.composite?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-standalone/src/main/resources/nuvemxmpp.composite (original)
+++ incubator/nuvem/trunk/nuvem-standalone/src/main/resources/nuvemxmpp.composite Thu Jun  2 17:07:36 2011
@@ -15,7 +15,7 @@
 	-->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://nuvemxmpp" name="xmpp">
+	targetNamespace="http://nuvemstandalone" name="xmpp">
 
 
 	<component name="XMPPComponent">

Modified: incubator/nuvem/trunk/nuvem-standalone/src/test/java/org/apache/nuvem/cloud/data/impl/MapDocumentServiceImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-standalone/src/test/java/org/apache/nuvem/cloud/data/impl/MapDocumentServiceImplTestCase.java?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-standalone/src/test/java/org/apache/nuvem/cloud/data/impl/MapDocumentServiceImplTestCase.java (original)
+++ incubator/nuvem/trunk/nuvem-standalone/src/test/java/org/apache/nuvem/cloud/data/impl/MapDocumentServiceImplTestCase.java Thu Jun  2 17:07:36 2011
@@ -1,5 +1,8 @@
 package org.apache.nuvem.cloud.data.impl;
 
+import org.junit.Ignore;
+
+@Ignore
 public class MapDocumentServiceImplTestCase {
 
 }

Modified: incubator/nuvem/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/pom.xml?rev=1130656&r1=1130655&r2=1130656&view=diff
==============================================================================
--- incubator/nuvem/trunk/pom.xml (original)
+++ incubator/nuvem/trunk/pom.xml Thu Jun  2 17:07:36 2011
@@ -91,7 +91,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <tuscany.version>2.0-M5.1</tuscany.version>
         <maven.gae.plugin.version>0.8.2</maven.gae.plugin.version>        
-        <gae.version>1.4.2</gae.version>
+        <gae.version>1.5.0.1</gae.version>
         <datanucleus.version>1.1.5</datanucleus.version>
     </properties>
     
@@ -195,8 +195,7 @@
                 <module>nuvem-google-appengine-sdk</module>                
                 <module>nuvem-standalone</module>
                 <module>nuvem-parallel</module>
-                <module>nuvem-samples</module>
-               	<module>nuvem-ibm</module>
+                <module>nuvem-ibm</module>
 		    	<module>nuvem-azure</module>
             </modules>
         </profile>
@@ -207,9 +206,7 @@
         <profile>
             <id>eclipse</id>
             <modules>
-                <module>nuvem-api</module>
-                <module>store-assets</module>
-                <module>store-catalog-ibmcloud-webapp</module>
+                <module>nuvem-samples</module>
             </modules>
         </profile>