Author: slaws
Date: Wed Nov 25 10:04:15 2009
New Revision: 884015
URL: http://svn.apache.org/viewvc?rev=884015&view=rev
Log:
Put loca; distribution/itest bin-distro-unzip dependencies into the
distribution profile as bin-distro-unzip isn't build in the default profile.
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml Wed
Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml Wed Nov
25 10:04:15 2009
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml Wed Nov 25 10:04:15
2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
Wed Nov 25 10:04:15 2009
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml?rev=884015&r1=884014&r2=884015&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml Wed
Nov 25 10:04:15 2009
@@ -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>
