From dc7accced99cd260d485df939859b4086cde5f2e Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Nov 2010 10:28:52 +0000
Subject: TUSCANY-3727 - fix binding-ws which jars so that it doesn't have base
 Tuscany jars. So we have binding-rmi and binding-ws as examples now. It this
 works we'll fix the rest for the next release. Also, for compliance tests,
 ensure that the phase of the unpack allows the local error message file to
 take precedence

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1032909 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml |  7 +++++++
 .../trunk/testing/compliance-tests/binding-jms/pom.xml       | 12 ++++++++++--
 .../trunk/testing/compliance-tests/binding-ws/pom.xml        |  9 ++++++++-
 sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml |  9 ++++++++-
 sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml  |  9 ++++++++-
 sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml   |  9 ++++++++-
 6 files changed, 49 insertions(+), 6 deletions(-)

(limited to 'sca-java-2.x/trunk/testing/compliance-tests')

diff --git a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
index 816ac32cfa..a332d488d9 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml
@@ -38,6 +38,13 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency> 
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
index 6413eecc66..2cc7f67495 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
@@ -40,8 +40,16 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-base-runtime</artifactId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
         </dependency>
 
         <dependency>
@@ -100,7 +108,7 @@
         <executions>
           <execution>
             <id>unpack</id>
-            <phase>test-compile</phase>
+            <phase>process-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
index 79cf97383b..869b5c93e0 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml
@@ -38,6 +38,13 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
@@ -113,7 +120,7 @@
         <executions>
           <execution>
             <id>unpack</id>
-            <phase>test-compile</phase>
+            <phase>process-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
index c2d1b610a4..9bea580918 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml
@@ -38,6 +38,13 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
@@ -110,7 +117,7 @@
         <executions>
           <execution>
             <id>unpack</id>
-            <phase>process-test-resources</phase>
+            <phase>process-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
index 796a0a0df0..3459117d57 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml
@@ -38,6 +38,13 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
@@ -107,7 +114,7 @@
         <executions>
           <execution>
             <id>unpack</id>
-            <phase>test-compile</phase>
+            <phase>process-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
index 1801ed7b29..cb86dc1b6d 100644
--- a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
+++ b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml
@@ -38,6 +38,13 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
@@ -112,7 +119,7 @@
         <executions>
           <execution>
             <id>unpack</id>
-            <phase>test-compile</phase>
+            <phase>process-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
-- 
cgit v1.2.3