Separate the distribution itests to individual sample tests

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

10 files changed, 416 insertions, 140 deletions

diff --git a/java/sca/itest/bin-distro-unzip/build.xml b/java/sca/itest/distribution/bin-distro-unzip/build.xml
index 2c997ebfe9..f8d36410b7 100644
--- a/java/sca/itest/bin-distro-unzip/build.xml
+++ b/java/sca/itest/distribution/bin-distro-unzip/build.xml
@@ -18,7 +18,7 @@
 -->

 <project name="itest-unzip" default="unzip"> 

     <target name="unzip"> 

-        <unzip src="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.zip" 

-               dest="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir"/>

+        <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.zip" 

+               dest="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir"/>

     </target>

 </project>

diff --git a/java/sca/itest/bin-distro-unzip/pom.xml b/java/sca/itest/distribution/bin-distro-unzip/pom.xml
index 3b4e570d80..1f6101961f 100644
--- a/java/sca/itest/bin-distro-unzip/pom.xml
+++ b/java/sca/itest/distribution/bin-distro-unzip/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

+        <artifactId>itest-distribution</artifactId>

         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

diff --git a/java/sca/itest/distribution/binding-ws-calculator/build.xml b/java/sca/itest/distribution/binding-ws-calculator/build.xml
new file mode 100644
index 0000000000..ee50366327
--- /dev/null
+++ b/java/sca/itest/distribution/binding-ws-calculator/build.xml
@@ -0,0 +1,40 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project name="itest-samples" default="run"> 

+	

+	<echo>${JAVA_HOME}</echo>

+	<!-- 

+	    compile and run each sample as though the user were running

+	    samples from the binary distribution. Here we use ant targets

+	    in the first instance but for some tests we may want to run 

+	    jars directly or fire up webapp containers and deploy wars. In other cases

+	    we may need to run two samples together to provide reference and 

+	    service sides of the sample.

+	-->

+

+    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT" />

+

+    <target name="run"> 

+    	

+        <ant antfile="build.xml"

+             dir="${distro.root}/samples/binding-ws-calculator"/>

+

+    </target>

+

+</project>

diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
new file mode 100644
index 0000000000..073c153a48
--- /dev/null
+++ b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>itest-distribution</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <artifactId>itest-distribution-binidng-ws-calculator</artifactId>

+    <name>Apache Tuscany SCA Distribution itest binding-ws-calculator</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>itest-bin-distro-unzip</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>        

+    </dependencies>

+    

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-antrun-plugin</artifactId>

+                <version>1.3</version>

+

+                <dependencies>

+                    <dependency>

+                        <groupId>ant</groupId>

+                        <artifactId>ant-trax</artifactId>

+                        <version>1.6.5</version>

+                    </dependency>

+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

+                    <dependency>

+                        <groupId>sun.jdk</groupId>

+                        <artifactId>tools</artifactId>

+                        <version>1.6</version>

+                        <scope>system</scope>

+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>

+                    </dependency>

+                </dependencies>

+

+                <executions>

+                    <execution>

+                        <id>run-samples</id>

+                        <phase>validate</phase>

+                        <goals>

+                            <goal>run</goal>

+                        </goals>

+                        <configuration>

+                            <tasks> 

+                                <ant antfile="./build.xml" target="run"/>

+                            </tasks>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+</project>

diff --git a/java/sca/itest/distribution/calculator-rmi/build.xml b/java/sca/itest/distribution/calculator-rmi/build.xml
new file mode 100644
index 0000000000..b405f747ea
--- /dev/null
+++ b/java/sca/itest/distribution/calculator-rmi/build.xml
@@ -0,0 +1,49 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project name="itest-samples" default="run"> 

+	

+	<echo>${JAVA_HOME}</echo>

+	<!-- 

+	    compile and run each sample as though the user were running

+	    samples from the binary distribution. Here we use ant targets

+	    in the first instance but for some tests we may want to run 

+	    jars directly or fire up webapp containers and deploy wars. In other cases

+	    we may need to run two samples together to provide reference and 

+	    service sides of the sample.

+	-->

+

+    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT" />

+

+    <target name="run"> 

+    	

+       <property name="time.to.live" id="ttl" value="4000" />

+

+       <parallel>

+            <ant antfile="build.xml" 

+                 dir="${distro.root}/samples/calculator-rmi-service"/>

+            <sequential>

+                <sleep seconds="2"/>

+                <ant antfile="build.xml"

+                     dir="${distro.root}/samples/calculator-rmi-reference"/>

+            </sequential>

+       </parallel>    	

+

+    </target>

+

+</project>

diff --git a/java/sca/itest/samples/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml
index b918be5def..3d13481460 100644
--- a/java/sca/itest/samples/pom.xml
+++ b/java/sca/itest/distribution/calculator-rmi/pom.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-samples</artifactId>
-    <name>Apache Tuscany SCA Samples Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-bin-distro-unzip</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.3</version>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
-                    <dependency>
-                        <groupId>sun.jdk</groupId>
-                        <artifactId>tools</artifactId>
-                        <version>1.6</version>
-                        <scope>system</scope>
-                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>run-samples</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks> 
-                                <ant antfile="./build.xml" target="run"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>itest-distribution</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <artifactId>itest-distribution-calculator-rmi</artifactId>

+    <name>Apache Tuscany SCA Distribution itest calculator-rmi</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>itest-bin-distro-unzip</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>        

+    </dependencies>

+    

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-antrun-plugin</artifactId>

+                <version>1.3</version>

+

+                <dependencies>

+                    <dependency>

+                        <groupId>ant</groupId>

+                        <artifactId>ant-trax</artifactId>

+                        <version>1.6.5</version>

+                    </dependency>

+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

+                    <dependency>

+                        <groupId>sun.jdk</groupId>

+                        <artifactId>tools</artifactId>

+                        <version>1.6</version>

+                        <scope>system</scope>

+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>

+                    </dependency>

+                </dependencies>

+

+                <executions>

+                    <execution>

+                        <id>run-samples</id>

+                        <phase>validate</phase>

+                        <goals>

+                            <goal>run</goal>

+                        </goals>

+                        <configuration>

+                            <tasks> 

+                                <ant antfile="./build.xml" target="run"/>

+                            </tasks>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+</project>

diff --git a/java/sca/itest/samples/build.xml b/java/sca/itest/distribution/implementation-java-calculator/build.xml
index 6f2f52f906..093ed715fc 100644
--- a/java/sca/itest/samples/build.xml
+++ b/java/sca/itest/distribution/implementation-java-calculator/build.xml
@@ -1,55 +1,40 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project name="itest-samples" default="run"> 
-	
-	<echo>${JAVA_HOME}</echo>
-	<!-- 
-	    compile and run each sample as though the user were running
-	    samples from the binary distribution. Here we use ant targets
-	    in the first instance but for some tests we may want to run 
-	    jars directly or fire up webapp containers and deploy wars. In other cases
-	    we may need to run two samples together to provide reference and 
-	    service sides of the sample.
-	-->
-
-    <property name="distro.root" value="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT" />
-
-    <target name="run"> 
-    	
-    	<property name="time.to.live" id="ttl" value="4000" />
-    	
-        <ant antfile="build.xml"
-    	     dir="${distro.root}/samples/implementation-java-calculator"/>
-    	
-        <ant antfile="build.xml"
-             dir="${distro.root}/samples/binding-ws-calculator"/> 
-    	
-    	<parallel>
-            <ant antfile="build.xml"
-        	     dir="${distro.root}/samples/calculator-rmi-service"/>
-    		<sequential>
-    		    <sleep seconds="2"/>
-                <ant antfile="build.xml"
-            	     dir="${distro.root}/samples/calculator-rmi-reference"/>
-    		</sequential>
-    	</parallel>
-    	
-    </target>
-
-</project>
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project name="itest-samples" default="run"> 

+	

+	<echo>${JAVA_HOME}</echo>

+	<!-- 

+	    compile and run each sample as though the user were running

+	    samples from the binary distribution. Here we use ant targets

+	    in the first instance but for some tests we may want to run 

+	    jars directly or fire up webapp containers and deploy wars. In other cases

+	    we may need to run two samples together to provide reference and 

+	    service sides of the sample.

+	-->

+

+    <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT" />

+

+    <target name="run"> 

+    	

+        <ant antfile="build.xml"

+    	     dir="${distro.root}/samples/implementation-java-calculator"/>

+    	

+    </target>

+

+</project>

diff --git a/java/sca/itest/distribution/implementation-java-calculator/pom.xml b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
new file mode 100644
index 0000000000..c475d25fa6
--- /dev/null
+++ b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>itest-distribution</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <artifactId>itest-distribution-implementation-java-calculator</artifactId>

+    <name>Apache Tuscany SCA Distribution itest implementation-java-calculator</name>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>itest-bin-distro-unzip</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>        

+    </dependencies>

+    

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-antrun-plugin</artifactId>

+                <version>1.3</version>

+

+                <dependencies>

+                    <dependency>

+                        <groupId>ant</groupId>

+                        <artifactId>ant-trax</artifactId>

+                        <version>1.6.5</version>

+                    </dependency>

+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

+                    <dependency>

+                        <groupId>sun.jdk</groupId>

+                        <artifactId>tools</artifactId>

+                        <version>1.6</version>

+                        <scope>system</scope>

+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>

+                    </dependency>

+                </dependencies>

+

+                <executions>

+                    <execution>

+                        <id>run-samples</id>

+                        <phase>validate</phase>

+                        <goals>

+                            <goal>run</goal>

+                        </goals>

+                        <configuration>

+                            <tasks> 

+                                <ant antfile="./build.xml" target="run"/>

+                            </tasks>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+</project>

diff --git a/java/sca/itest/distribution/pom.xml b/java/sca/itest/distribution/pom.xml
new file mode 100644
index 0000000000..3a8273ccf7
--- /dev/null
+++ b/java/sca/itest/distribution/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>tuscany-itest</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <packaging>pom</packaging>

+    <artifactId>itest-distribution</artifactId>

+    <name>Apache Tuscany SCA Distribution Integration Tests</name>

+    

+  <build>

+	<defaultGoal>install</defaultGoal>

+  </build>

+

+  <modules>

+    <module>bin-distro-unzip</module>

+    <module>binding-ws-calculator</module>

+    <module>calculator-rmi</module>

+    <module>implementation-java-calculator</module>

+  </modules>

+

+</project>

diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml
index 4db69babe5..2a61ba85e9 100644
--- a/java/sca/itest/pom.xml
+++ b/java/sca/itest/pom.xml
@@ -69,8 +69,7 @@
                 -->
                 <module>recursive-multi-level</module>
                 <module>references</module>
-                <module>bin-distro-unzip</module>
-                <module>samples</module>
+                <module>distribution</module>
                 <module>scopes</module>
                 <module>services</module>
                 <module>wires</module>