From 4d25cad24d31f5f8c275d5fd631b1844473fb2ac Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 9 Apr 2009 14:30:12 +0000
Subject: Tag 2.0-M2

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@763664 13f79535-47bb-0310-9956-ffa450edef68
---
 .../itest/distribution/bin-distro-unzip/build.xml  |  24 ++++
 .../itest/distribution/bin-distro-unzip/pom.xml    | 137 +++++++++++++++++++++
 .../distribution/binding-ws-calculator/build.xml   |  40 ++++++
 .../distribution/binding-ws-calculator/pom.xml     |  81 ++++++++++++
 .../itest/distribution/calculator-rmi/build.xml    |  51 ++++++++
 .../itest/distribution/calculator-rmi/pom.xml      |  81 ++++++++++++
 .../implementation-java-calculator/build.xml       |  40 ++++++
 .../implementation-java-calculator/pom.xml         |  81 ++++++++++++
 tags/java/sca/2.0-M2/itest/distribution/pom.xml    |  45 +++++++
 .../distribution/webapp-helloworld-jsp/pom.xml     | 124 +++++++++++++++++++
 .../src/test/java/itest/HelloworldTestCase.java    |  50 ++++++++
 .../distribution/webapp-helloworld-stripes/pom.xml | 124 +++++++++++++++++++
 .../src/test/java/itest/HelloworldTestCase.java    |  53 ++++++++
 .../itest/distribution/webapp-helloworld/pom.xml   | 121 ++++++++++++++++++
 14 files changed, 1052 insertions(+)
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/build.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/build.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/build.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/build.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/pom.xml
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
 create mode 100644 tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld/pom.xml

(limited to 'tags/java/sca/2.0-M2/itest/distribution')

diff --git a/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/build.xml b/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/build.xml
new file mode 100644
index 0000000000..7542fc23dd
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/build.xml
@@ -0,0 +1,24 @@
+<!--
+ * 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-unzip" default="unzip"> 
+    <target name="unzip"> 
+        <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip" 
+               dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir"/>
+    </target>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/pom.xml
new file mode 100644
index 0000000000..673f903917
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/bin-distro-unzip/pom.xml
@@ -0,0 +1,137 @@
+<?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-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bin-distro-unzip</artifactId>
+    <name>Apache Tuscany SCA iTest Bin Distro Unzip</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-all</artifactId>
+            <type>pom</type>
+            <version>2.0-M2</version>
+        </dependency>
+    </dependencies>
+
+    <!-- HACK: use profile to control if we need to add tools.jar  -->
+    <!-- Mac OS doesn't have tools.jar -->
+    <profiles>
+        <profile>
+            <id>not-sun-jdk</id>
+            <activation>
+                <file>
+                    <missing>${java.home}/../lib/tools.jar</missing>
+                </file>
+            </activation>
+            <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>
+                        </dependencies>
+
+                        <executions>
+                            <execution>
+                                <id>run-samples</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <property name="java.home" value="${java.home}"/>
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sun-jdk</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
+            </activation>
+            <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="java.home" value="${java.home}"/>
+                                        <property name="tuscany.version" value="${version}" />
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/build.xml b/tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/build.xml
new file mode 100644
index 0000000000..bfcdfe1063
--- /dev/null
+++ b/tags/java/sca/2.0-M2/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-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
+
+    <target name="run"> 
+    	
+        <ant antfile="build.xml"
+             dir="${distro.root}/samples/binding-ws-calculator"/>
+
+    </target>
+
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/pom.xml
new file mode 100644
index 0000000000..5784129d22
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/binding-ws-calculator/pom.xml
@@ -0,0 +1,81 @@
+<?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-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distribution-binding-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-M2</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>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/build.xml b/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/build.xml
new file mode 100644
index 0000000000..fb6f20f9c1
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/build.xml
@@ -0,0 +1,51 @@
+<!--
+ * 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"> 
+    	
+       <parallel>
+
+            <daemons>
+               <ant antfile="build.xml" 
+                    dir="${distro.root}/samples/calculator-rmi-service"/>
+            </daemons>
+
+            <sequential>
+                <sleep seconds="2"/>
+                <ant antfile="build.xml"
+                     dir="${distro.root}/samples/calculator-rmi-reference"/>
+            </sequential>
+
+       </parallel>    	
+
+    </target>
+
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/pom.xml
new file mode 100644
index 0000000000..3b3a4a0345
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/calculator-rmi/pom.xml
@@ -0,0 +1,81 @@
+<?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-M2</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-M2</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>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/build.xml b/tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/build.xml
new file mode 100644
index 0000000000..3da5aace09
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/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/tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/pom.xml
new file mode 100644
index 0000000000..1ca88516a1
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/implementation-java-calculator/pom.xml
@@ -0,0 +1,81 @@
+<?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-M2</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-M2</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>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/pom.xml
new file mode 100644
index 0000000000..5ba2091d1c
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/pom.xml
@@ -0,0 +1,45 @@
+<?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-M2</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>
+    <module>webapp-helloworld</module>
+    <module>webapp-helloworld-jsp</module>
+  </modules>
+
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/pom.xml
new file mode 100644
index 0000000000..9ff4fe18e3
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -0,0 +1,124 @@
+<?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-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distribution-webapp-helloworld-jsp</artifactId>
+    <name>Apache Tuscany SCA Distribution iTest Webapp helloworld-jsp</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-bin-distro-unzip</artifactId>
+            <type>pom</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>helloworld-jsp</artifactId>
+            <type>war</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>1.9</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <executions>
+                    <execution>
+                        <id>start-container</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <wait>false</wait>
+                    <container>
+                        <containerId>jetty6x</containerId>
+                        <type>embedded</type>  
+                        <systemProperties>
+                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+                        </systemProperties>
+                    </container>
+                    <!-- container>
+                        <containerId>tomcat6x</containerId>
+                        <home>/Tomcat/apache-tomcat-6.0.18</home>
+                    </container -->
+                    <configuration>
+                        <home>${project.build.directory}/cargo-jetty</home>
+                        <properties>
+                            <!-- NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug
+                                       uncomment/comment the container above to be the Tomcat container and set home to point
+                                       to your local Tomcat installation   -->
+                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs> 
+                            <cargo.servlet.port>8085</cargo.servlet.port>
+                            <context>helloworld-jsp</context>
+                        </properties>
+                        <deployables>
+                           <deployable>
+                              <groupId>org.apache.tuscany.sca</groupId>
+                              <artifactId>helloworld-jsp</artifactId>
+                              <type>war</type>
+                              <properties>
+                                 <context>helloworld-jsp</context>
+                              </properties>
+                           </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>                
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..7bcd590cf0
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * 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.    
+ */
+
+package itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
+        Iterator<?> ss = page.getAllHtmlChildElements();
+        ss.next();
+        ss.next();
+        ss.next();
+        HtmlParagraph p = (HtmlParagraph)ss.next();
+        assertEquals("Hello world", p.asText());
+    }
+
+}
diff --git a/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/pom.xml
new file mode 100644
index 0000000000..d7072196c5
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/pom.xml
@@ -0,0 +1,124 @@
+<?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-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distribution-webapp-helloworld-stripes</artifactId>
+    <name>Apache Tuscany SCA Distribution iTest Webapp helloworld-stripes</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-bin-distro-unzip</artifactId>
+            <type>pom</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>helloworld-stripes</artifactId>
+            <type>war</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>1.9</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <executions>
+                    <execution>
+                        <id>start-container</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <wait>false</wait>
+                    <container>
+                        <containerId>jetty6x</containerId>
+                        <type>embedded</type>  
+                        <systemProperties>
+                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+                        </systemProperties>
+                    </container>
+                    <!-- container>
+                        <containerId>tomcat6x</containerId>
+                        <home>/Tomcat/apache-tomcat-6.0.18</home>
+                    </container -->
+                    <configuration>
+                        <home>${project.build.directory}/cargo-jetty</home>
+                        <properties>
+                            <!-- NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug
+                                       uncomment/comment the container above to be the Tomcat container and set home to point
+                                       to your local Tomcat installation   -->
+                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs> 
+                            <cargo.servlet.port>8085</cargo.servlet.port>
+                            <context>helloworld-stripes</context>
+                        </properties>
+                        <deployables>
+                           <deployable>
+                              <groupId>org.apache.tuscany.sca</groupId>
+                              <artifactId>helloworld-stripes</artifactId>
+                              <type>war</type>
+                              <properties>
+                                 <context>helloworld-stripes</context>
+                              </properties>
+                           </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>                
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
diff --git a/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..4c75e312b5
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * 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.    
+ */
+
+package itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes");
+        Iterator<?> ss = page.getAllHtmlChildElements();
+        Object o1= ss.next();
+        Object o2= ss.next();
+        Object o3= ss.next();
+        Object o4= ss.next();
+        Object o5= ss.next();
+        Object o6= ss.next();
+        HtmlParagraph p = (HtmlParagraph)ss.next();
+        assertEquals("sayHello returns: Hello world", p.asText());
+    }
+
+}
diff --git a/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld/pom.xml b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld/pom.xml
new file mode 100644
index 0000000000..ac62f8962a
--- /dev/null
+++ b/tags/java/sca/2.0-M2/itest/distribution/webapp-helloworld/pom.xml
@@ -0,0 +1,121 @@
+<?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-M2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distribution-webapp-helloworld</artifactId>
+    <name>Apache Tuscany SCA Distribution iTest Webapp helloworld</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-bin-distro-unzip</artifactId>
+            <type>pom</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>helloworld</artifactId>
+            <type>war</type>
+            <version>2.0-M2</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <executions>
+                    <execution>
+                        <id>start-container</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <wait>false</wait>
+                    <container>
+                        <containerId>jetty6x</containerId>
+                        <type>embedded</type>  
+                        <systemProperties>
+                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+                        </systemProperties>
+                    </container>
+                    <!-- container>
+                        <containerId>tomcat6x</containerId>
+                        <home>/Tomcat/apache-tomcat-6.0.18</home>
+                    </container -->
+                    <configuration>
+                        <home>${project.build.directory}/cargo-jetty</home>
+                        <properties>
+                            <!-- NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug
+                                       uncomment/comment the container above to be the Tomcat container and set home to point
+                                       to your local Tomcat installation   -->
+                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs> 
+                            <cargo.servlet.port>8085</cargo.servlet.port>
+                        </properties>
+                        <deployables>
+                           <deployable>
+                              <groupId>org.apache.tuscany.sca</groupId>
+                              <artifactId>helloworld</artifactId>
+                              <type>war</type>
+                              <pingURL>http://localhost:8085/helloworld</pingURL>
+                           </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>                
+            </plugin>
+
+        </plugins>
+    </build>
+</project>
-- 
cgit v1.2.3