Change the sample itests to use an unzipped bin distro

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

6 files changed, 106 insertions, 39 deletions

diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml
index 9e0ecf6429..2c805d375e 100644
--- a/java/sca/distribution/all/pom.xml
+++ b/java/sca/distribution/all/pom.xml
@@ -71,7 +71,6 @@
                         </goals>

                         <configuration>

                             <descriptors>

-                                <descriptor>src/main/assembly/dir.xml</descriptor>

                                 <descriptor>src/main/assembly/bin.xml</descriptor>

                                 <descriptor>src/main/assembly/src.xml</descriptor>

                             </descriptors>

diff --git a/java/sca/distribution/all/src/main/assembly/dir.xml b/java/sca/distribution/all/src/main/assembly/dir.xml
deleted file mode 100644
index ebbc72d9aa..0000000000
--- a/java/sca/distribution/all/src/main/assembly/dir.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>dir</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../all/src/main/components/bin-launcher.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/java/sca/itest/bin-distro-unzip/build.xml b/java/sca/itest/bin-distro-unzip/build.xml
new file mode 100644
index 0000000000..2c997ebfe9
--- /dev/null
+++ b/java/sca/itest/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-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/bin-distro-unzip/pom.xml
new file mode 100644
index 0000000000..3b4e570d80
--- /dev/null
+++ b/java/sca/itest/bin-distro-unzip/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>tuscany-itest</artifactId>

+        <version>2.0-SNAPSHOT</version>

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

+    </parent>

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

+    <name>Apache Tuscany SCA Bin Distro Unzip</name>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>tuscany-distribution-all</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"/>

+                            </tasks>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+</project>

diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml
index 3f6490dd6f..4db69babe5 100644
--- a/java/sca/itest/pom.xml
+++ b/java/sca/itest/pom.xml
@@ -69,6 +69,7 @@
                 -->
                 <module>recursive-multi-level</module>
                 <module>references</module>
+                <module>bin-distro-unzip</module>
                 <module>samples</module>
                 <module>scopes</module>
                 <module>services</module>
diff --git a/java/sca/itest/samples/pom.xml b/java/sca/itest/samples/pom.xml
index e43ddea0a9..b918be5def 100644
--- a/java/sca/itest/samples/pom.xml
+++ b/java/sca/itest/samples/pom.xml
@@ -31,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-all</artifactId>
+            <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>