You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/10/29 01:23:28 UTC

svn commit: r830808 - in /tuscany/sandbox/sca-cloud-tutorial: cloud-google/build-appengine.xml cloud-google/pom.xml pom.xml

Author: lresende
Date: Thu Oct 29 00:23:28 2009
New Revision: 830808

URL: http://svn.apache.org/viewvc?rev=830808&view=rev
Log:
Integrating with cloud-appengine-sdk module to avoid issues with building the cloud-google module with a clean maven repo (without appengine sdk available in it)

Removed:
    tuscany/sandbox/sca-cloud-tutorial/cloud-google/build-appengine.xml
Modified:
    tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
    tuscany/sandbox/sca-cloud-tutorial/pom.xml

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=830808&r1=830807&r2=830808&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/cloud-google/pom.xml Thu Oct 29 00:23:28 2009
@@ -36,24 +36,17 @@
 			<artifactId>tuscany-cloud-api</artifactId>
 			<version>2.0-SNAPSHOT</version>
 		</dependency>
-		
-		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-tools</artifactId>
-			<version>1.2.6</version>
-			<scope>provided</scope>
-		</dependency>		
 
 		<dependency>
-			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-api</artifactId>
-			<version>1.2.6</version>
-			<scope>provided</scope>
-		</dependency>		
-
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-cloud-appengine-sdk</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		
 		<dependency>
 			<groupId>com.google.appengine</groupId>
-			<artifactId>appengine-local-runtime-shared</artifactId>
+			<artifactId>appengine-api</artifactId>
 			<version>1.2.6</version>
 			<scope>provided</scope>
 		</dependency>		
@@ -90,52 +83,8 @@
                     </classpathContainers>
                 </configuration>
             </plugin>            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <!-- version>1.1</version --> 
-			    <dependencies>
-			        <dependency>
-			    	    <groupId>ant</groupId>
-			    	    <artifactId>ant-trax</artifactId>
-			    	    <version>1.6.5</version>
-			        </dependency>
-			    </dependencies>                    
-                <executions>
-                    <execution> 
-                        <id>install-appengine</id>                       
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-appengine.xml" target="install">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution> 
-                        <id>clean-appengine-files</id>                       
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-appengine.xml" target="clean-appengine-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin> 
         </plugins>   		
 	</build>		
-	
-	
 
 </project>
 

Modified: tuscany/sandbox/sca-cloud-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sca-cloud-tutorial/pom.xml?rev=830808&r1=830807&r2=830808&view=diff
==============================================================================
--- tuscany/sandbox/sca-cloud-tutorial/pom.xml (original)
+++ tuscany/sandbox/sca-cloud-tutorial/pom.xml Thu Oct 29 00:23:28 2009
@@ -38,6 +38,7 @@
             </activation>
             <modules>
                 <module>cloud-api</module>
+                <module>cloud-appengine-sdk</module>                
                 <module>cloud-google</module>
                 <module>store-assets</module>
                 <module>store-appengine-webapp</module>