Configure the sourceDirectory and use GAE classpath container for cloud-google project

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830787 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 127 insertions, 84 deletions

diff --git a/sandbox/sca-cloud-tutorial/cloud-google/pom.xml b/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
index d5848d13cf..20ac96d799 100644
--- a/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
+++ b/sandbox/sca-cloud-tutorial/cloud-google/pom.xml
@@ -75,7 +75,21 @@
 	
 	<build>
 		<plugins>
-            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>com.google.appengine:appengine-tools</exclude>
+                        <exclude>com.google.appengine:appengine-api</exclude>
+                        <exclude>com.google.appengine:appengine-local-runtime-shared</exclude>
+                    </excludes>
+                    <classpathContainers>
+                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                        <classpathContainer>com.google.appengine.eclipse.core.GAE_CONTAINER</classpathContainer>
+                    </classpathContainers>
+                </configuration>
+            </plugin>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
diff --git a/sandbox/sca-cloud-tutorial/expertise-rest-appengine-webapp/pom.xml b/sandbox/sca-cloud-tutorial/expertise-rest-appengine-webapp/pom.xml
index e93b0e3737..b69584f7b9 100644
--- a/sandbox/sca-cloud-tutorial/expertise-rest-appengine-webapp/pom.xml
+++ b/sandbox/sca-cloud-tutorial/expertise-rest-appengine-webapp/pom.xml
@@ -67,12 +67,17 @@
     
     <build>
        <finalName>${artifactId}</finalName>
+       <sourceDirectory>src</sourceDirectory>
        <outputDirectory>war/WEB-INF/classes</outputDirectory>
        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <configuration>
+                    <sourceIncludes>
+                        <sourceInclude>**/*</sourceInclude>
+                    </sourceIncludes>
+                
                     <projectnatures>
                         <projectnature>org.eclipse.jdt.core.javanature</projectnature>
                         <projectnature>com.google.appengine.eclipse.core.gaeNature</projectnature>
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml b/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml
index c83e9cf7ac..e0707d52d6 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/pom.xml
@@ -29,79 +29,98 @@
     <packaging>war</packaging>
     <name>Apache Tuscany Store</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>store-assets</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
+    <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-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-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-cloud-google</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.appengine</groupId>
+                    <artifactId>appengine-tools</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.appengine</groupId>
+                    <artifactId>appengine-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.appengine</groupId>
+                    <artifactId>appengine-local-runtime-shared</artifactId>
+                </exclusion>
+            </exclusions>
+        </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-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-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>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>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-    
     <build>
-       <finalName>${artifactId}</finalName>
-       <outputDirectory>war/WEB-INF/classes</outputDirectory>
-       <plugins>
+        <finalName>${artifactId}</finalName>
+        <sourceDirectory>src</sourceDirectory>
+        <outputDirectory>war/WEB-INF/classes</outputDirectory>
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <configuration>
+                    <sourceIncludes>
+                        <sourceInclude>**/*</sourceInclude>
+                    </sourceIncludes>
+
                     <projectnatures>
                         <projectnature>org.eclipse.jdt.core.javanature</projectnature>
                         <projectnature>com.google.appengine.eclipse.core.gaeNature</projectnature>
@@ -119,21 +138,21 @@
                     </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>                    
+                <!-- version>1.1</version -->
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
                 <executions>
-                    <execution> 
-                        <id>install-dojo</id>                       
+                    <execution>
+                        <id>install-dojo</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>run</goal>
@@ -141,13 +160,13 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="./build-dojo.xml" target="install-dojo">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                    <property name="localRepository" value="${settings.localRepository}" />
                                 </ant>
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution> 
-                        <id>copy-dojo-files</id>                       
+                    <execution>
+                        <id>copy-dojo-files</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -155,14 +174,14 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
+                                    <property name="localRepository" value="${settings.localRepository}" />
+                                    <property name="artifactId" value="${artifactId}" />
                                 </ant>
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution> 
-                        <id>clean-dojo-files</id>                       
+                    <execution>
+                        <id>clean-dojo-files</id>
                         <phase>clean</phase>
                         <goals>
                             <goal>run</goal>
@@ -170,15 +189,15 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
+                                    <property name="localRepository" value="${settings.localRepository}" />
+                                    <property name="artifactId" value="${artifactId}" />
                                 </ant>
                             </tasks>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin> 
-            
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -206,7 +225,7 @@
                     <warSourceDirectory>war</warSourceDirectory>
                 </configuration>
             </plugin>
-        </plugins>       
+        </plugins>
     </build>
 
 </project>
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml b/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml
index 2e5f3f7280..28ba9c2d00 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml
+++ b/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/pom.xml
@@ -83,6 +83,7 @@
     
     <build>
        <finalName>${artifactId}</finalName>
+       <sourceDirectory>src</sourceDirectory>
        <outputDirectory>war/WEB-INF/classes</outputDirectory>
        
        <plugins>
@@ -90,6 +91,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <configuration>
+                    <sourceIncludes>
+                        <sourceInclude>**/*</sourceInclude>
+                    </sourceIncludes>
+                
                     <projectnatures>
                         <projectnature>org.eclipse.jdt.core.javanature</projectnature>
                         <projectnature>com.google.appengine.eclipse.core.gaeNature</projectnature>