summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-25 10:04:15 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-11-25 10:04:15 +0000
commitde5197c39ffbdaec890debe429faf1c07212e338 (patch)
treee40185e737007e1c1052edbf07034adff96d1960 /sca-java-2.x/trunk
parent67e1bed89e5f41d03ff7c285880690d2b23ef64a (diff)
Put loca; distribution/itest bin-distro-unzip dependencies into the distribution profile as bin-distro-unzip isn't build in the default profile.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884015 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml23
-rw-r--r--sca-java-2.x/trunk/itest/distribution/pom.xml26
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml23
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml21
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml23
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml23
13 files changed, 181 insertions, 105 deletions
diff --git a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
index 3f4cb4b536..907bc69399 100644
--- a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
@@ -28,14 +28,19 @@
<artifactId>itest-distribution-binding-ws-calculator</artifactId>
<name>Apache Tuscany SCA iTest Distribution 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>
+ <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>
diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
index faf6132fbd..6bb18c463c 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
@@ -28,14 +28,19 @@
<artifactId>itest-distribution-calculator-rmi</artifactId>
<name>Apache Tuscany SCA iTest Distribution 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>
+ <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>
diff --git a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
index 584b7ca5e9..497364c13e 100644
--- a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
@@ -28,14 +28,19 @@
<artifactId>itest-distribution-implementation-java-calculator</artifactId>
<name>Apache Tuscany SCA iTest Distribution 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>
+ <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>
diff --git a/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
index c5f118458f..3be416937e 100644
--- a/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
@@ -28,15 +28,20 @@
<artifactId>itest-distribution-legal-checks</artifactId>
<name>Apache Tuscany SCA iTest Distribution Legal Checks</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>
-
+ <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>
</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 c0351b28fc..49bca4c4ea 100644
--- a/sca-java-2.x/trunk/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/pom.xml
@@ -38,19 +38,6 @@
</dependency>
</dependencies>
- <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>
-
<profiles>
<profile>
<id>default</id>
@@ -67,6 +54,19 @@
</profile>
</profiles>
+ <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>
+
<build>
<defaultGoal>install</defaultGoal>
</build>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
index e1c8a508f5..b12fd1bf15 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
@@ -27,15 +27,22 @@
</parent>
<artifactId>itest-distribution-webapp-helloworld-bpel</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-bpel</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>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
index 97662f26ca..c7013ce853 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
@@ -28,14 +28,21 @@
<artifactId>itest-distribution-webapp-helloworld-jms</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-jms</name>
- <dependencies>
+ <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>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
index 32c66015d0..d5da35e2be 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
@@ -28,14 +28,21 @@
<artifactId>itest-distribution-webapp-helloworld-js-client</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-js-client</name>
- <dependencies>
+ <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>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
index 3a2ff11a11..06b862058f 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
@@ -28,14 +28,21 @@
<artifactId>itest-distribution-webapp-helloworld-jsf</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-jsf</name>
- <dependencies>
+ <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>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index 4f41a3a0ef..2d9f1153ef 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -27,18 +27,25 @@
</parent>
<artifactId>itest-distribution-webapp-helloworld-jsp</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-jsp</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>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>helloworld-jsp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
index 2b5915ca88..9c3342d6fb 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
@@ -27,18 +27,25 @@
</parent>
<artifactId>itest-distribution-webapp-helloworld-servlet</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-servlet</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>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>helloworld-servlet</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
index 8d312f75c8..04294f4fa9 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
@@ -27,15 +27,22 @@
</parent>
<artifactId>itest-distribution-webapp-helloworld-stripes</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld-stripes</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>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
index 81d7304e00..68dc0fe382 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
@@ -27,15 +27,22 @@
</parent>
<artifactId>itest-distribution-webapp-helloworld</artifactId>
<name>Apache Tuscany SCA iTest Distribution Webapp helloworld</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>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>