update distro itests to match sample changes

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

9 files changed, 246 insertions, 25 deletions

diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
new file mode 100644
index 0000000000..86afb7a952
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml
@@ -0,0 +1,39 @@
+<!--
+ * 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"> 
+	
+	<!-- 
+	    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-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+
+    <target name="run"> 
+        <ant antfile="build.xml"
+             dir="${distro.root}/samples/binding-rmi/contribution-calculator-reference"/>
+        <ant antfile="build.xml"
+             dir="${distro.root}/samples/binding-rmi/contribution-calculator-service"/>
+    </target>
+
+</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index bbc4ee3adc..2f3f04c1f5 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>itest-distribution-calculator-rmi</artifactId>
-    <name>Apache Tuscany SCA iTest Distribution calculator-rmi</name>
+    <artifactId>itest-distribution-contribution-binding-rmi-calculator</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Contribution binding-rmi Calculator</name>
 
     <profiles>
         <profile>
diff --git a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
index d813064e89..d813064e89 100644
--- a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
diff --git a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
index 497364c13e..b72c3de3c0 100644
--- a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>itest-distribution-implementation-java-calculator</artifactId>
-    <name>Apache Tuscany SCA iTest Distribution implementation-java-calculator</name>
+    <artifactId>itest-distribution-contribution-binding-sca-calculator</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution contribution-binding-sca-calculator</name>
 
     <profiles>
         <profile>
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
new file mode 100644
index 0000000000..d813064e89
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-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-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
+
+    <target name="run"> 
+    	
+        <ant antfile="build.xml"
+    	     dir="${distro.root}/samples/implementation-java-calculator"/>
+    	
+    </target>
+
+</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
new file mode 100644
index 0000000000..46482134c2
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml
@@ -0,0 +1,87 @@
+<?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-contribution-implementation-java-calculator</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution contribution-implementation-java-calculator</name>
+
+    <profiles>
+        <profile>
+            <id>distribution</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>itest-bin-distro-unzip</artifactId>
+                    <type>pom</type>
+                    <version>2.0-SNAPSHOT</version>
+                </dependency>        
+            </dependencies>
+        </profile>
+    </profiles>
+    
+    <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>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <property name="java.home" value="${java.home}"/>
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
index fbe58b6db7..a7c9b8f5aa 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml
@@ -18,6 +18,7 @@
 -->
 <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
@@ -31,20 +32,8 @@
 
     <target name="run"> 
     	
-       <parallel>
-
-            <daemons>
-               <ant antfile="build.xml" 
-                    dir="${distro.root}/samples/calculator-rmi-service"/>
-            </daemons>
-
-            <sequential>
-                <sleep seconds="25"/>
-                <ant antfile="build.xml"
-                     dir="${distro.root}/samples/calculator-rmi-reference"/>
-            </sequential>
-
-       </parallel>    	
+        <ant antfile="build.xml"
+             dir="${distro.root}/samples/launcher-embedded-osgi"/>
 
     </target>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
new file mode 100644
index 0000000000..0e4a97a07f
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml
@@ -0,0 +1,69 @@
+<?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-launcher-embedded-osgi</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Launcher Embedded OSGi</name>
+
+    <profiles>
+        <profile>
+            <id>distribution</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>itest-bin-distro-unzip</artifactId>
+                    <type>pom</type>
+                    <version>2.0-SNAPSHOT</version>
+                </dependency>        
+            </dependencies>
+        </profile>
+    </profiles>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="java.home" value="${java.home}"/>
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/pom.xml b/sca-java-2.x/trunk/itest/distribution/pom.xml
index 082f1831ca..fedd34c7a5 100644
--- a/sca-java-2.x/trunk/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/pom.xml
@@ -56,15 +56,12 @@
 
     <modules>
         <module>legal-checks</module>
-
-
-        <!--module>implementation-java-calculator</module-->
-
-<!--
+        <module>contribution-binding-sca-calculator</module>
         <module>contribution-binding-ws-calculator</module>
+        <module>contribution-binding-rmi-calculator</module>
+        <module>contribution-implementation-java-calculator</module>
         <module>launcher-embedded-jse</module>
-        <module>calculator-rmi</module>
--->
+        <module>launcher-embedded-osgi</module>
     </modules>
 
     <build>