summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/itest/distribution
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-24 12:40:17 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-24 12:40:17 +0000
commit0f974e6c66a16d4f0cde94e9f9cbee3205642154 (patch)
tree2377c71eaefcbb16253f60d1652fe4219abbaef5 /sca-java-2.x/trunk/itest/distribution
parent9609737d78c824a2412b94bdbd9667d4388ef81e (diff)
Set the default maven build to not generate distribution archives but generate a directory instead. To run a build that generates the archives use mvn -Pdistribution instead.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@883670 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/itest/distribution')
-rw-r--r--sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml5
-rw-r--r--sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml2
-rw-r--r--sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml2
-rw-r--r--sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml2
-rw-r--r--sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java2
-rw-r--r--sca-java-2.x/trunk/itest/distribution/pom.xml67
6 files changed, 58 insertions, 22 deletions
diff --git a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
index 68e15d4a8b..6c4b1fdf3f 100644
--- a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
@@ -17,8 +17,11 @@
* under the License.
-->
<project name="itest-unzip" default="unzip">
+
<target name="unzip">
+ <delete dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
<unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip"
- dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir"/>
+ dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
</target>
+
</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
index ed22bce2dc..aa5811e6da 100644
--- a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
@@ -28,7 +28,7 @@
service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
index 25abf4e040..e01c0182da 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
@@ -27,7 +27,7 @@
service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
index 106fee758c..d813064e89 100644
--- a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
@@ -28,7 +28,7 @@
service sides of the sample.
-->
- <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}" />
+ <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
<target name="run">
diff --git a/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 2cbbe57125..3564128c8d 100644
--- a/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
@@ -130,7 +130,7 @@ public class JarsInLICENSETestCase {
File distroTarget = new File("../../../distribution/all/target");
File root = null;
for (String f : distroTarget.list()) {
- if (f.endsWith("-dir")) {
+ if (f.endsWith(".dir")) {
root = new File(distroTarget, f);
break;
}
diff --git a/sca-java-2.x/trunk/itest/distribution/pom.xml b/sca-java-2.x/trunk/itest/distribution/pom.xml
index f8809b5ab2..9db949c937 100644
--- a/sca-java-2.x/trunk/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/pom.xml
@@ -28,23 +28,56 @@
<packaging>pom</packaging>
<artifactId>itest-distribution</artifactId>
<name>Apache Tuscany SCA iTest Distribution</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>legal-checks</module>
- <module>webapp-helloworld</module>
- <module>webapp-helloworld-bpel</module>
- <module>webapp-helloworld-js-client</module>
- <module>webapp-helloworld-jsp</module>
- <module>webapp-helloworld-servlet</module>
- <module>webapp-helloworld-stripes</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-all</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>binding-ws-calculator</module>
+ <module>calculator-rmi</module>
+ <module>implementation-java-calculator</module>
+ <module>legal-checks</module>
+ <module>webapp-helloworld</module>
+ <module>webapp-helloworld-bpel</module>
+ <module>webapp-helloworld-js-client</module>
+ <module>webapp-helloworld-jsp</module>
+ <module>webapp-helloworld-servlet</module>
+ <module>webapp-helloworld-stripes</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>distribution</id>
+ <modules>
+ <module>bin-distro-unzip</module>
+ <module>binding-ws-calculator</module>
+ <module>calculator-rmi</module>
+ <module>implementation-java-calculator</module>
+ <module>legal-checks</module>
+ <module>webapp-helloworld</module>
+ <module>webapp-helloworld-bpel</module>
+ <module>webapp-helloworld-js-client</module>
+ <module>webapp-helloworld-jsp</module>
+ <module>webapp-helloworld-servlet</module>
+ <module>webapp-helloworld-stripes</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
</project>