From 4f47a822cec0e9870f745990fdca0d06b50cc380 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Nov 2010 14:45:47 +0000
Subject: convert to base + extensions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1032998 13f79535-47bb-0310-9956-ffa450edef68
---
 .../newlayout/tuscany-java-ci-test-runner/pom.xml  | 24 ++-----
 otest/newlayout/tuscany-jms-test-runner/pom.xml    | 73 +++++++++++-----------
 otest/newlayout/tuscany-policy-test-runner/pom.xml | 39 +++---------
 otest/newlayout/tuscany-ws-test-runner/pom.xml     | 33 ++--------
 4 files changed, 58 insertions(+), 111 deletions(-)

(limited to 'otest')

diff --git a/otest/newlayout/tuscany-java-ci-test-runner/pom.xml b/otest/newlayout/tuscany-java-ci-test-runner/pom.xml
index 0b7d5f9b44..c3abf30b91 100644
--- a/otest/newlayout/tuscany-java-ci-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-java-ci-test-runner/pom.xml
@@ -31,27 +31,17 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -86,8 +76,6 @@
 
     </dependencies>
 
-
-
     <build>
         <finalName>${artifactId}</finalName>
         <plugins>
diff --git a/otest/newlayout/tuscany-jms-test-runner/pom.xml b/otest/newlayout/tuscany-jms-test-runner/pom.xml
index 6ac9343820..792bb6fc4a 100644
--- a/otest/newlayout/tuscany-jms-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-jms-test-runner/pom.xml
@@ -32,49 +32,27 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
@@ -83,23 +61,19 @@
             <artifactId>tuscany-binding-jms</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-all</artifactId>
             <version>5.2.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -218,8 +192,35 @@
                             </sources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>add-test-resource</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                   <directory>src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                  <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                  <includes>
+                    <include>**/*</include>
+                  </includes>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>
diff --git a/otest/newlayout/tuscany-policy-test-runner/pom.xml b/otest/newlayout/tuscany-policy-test-runner/pom.xml
index 3a8f7eec46..a6f166f7b3 100644
--- a/otest/newlayout/tuscany-policy-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-policy-test-runner/pom.xml
@@ -31,42 +31,27 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
         </dependency> 
-        
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
         
@@ -75,15 +60,9 @@
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>        
-                
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
 
 <!-- This dependency causes a problem on systems that haven't compiled the 
-     OASIS contributions independently and hence haven't dded them to their 
+     OASIS contributions independently and hence haven't added them to their 
      Local repo. 
         <dependency>
             <groupId>org.oasis-open.sca.assembly</groupId>
diff --git a/otest/newlayout/tuscany-ws-test-runner/pom.xml b/otest/newlayout/tuscany-ws-test-runner/pom.xml
index 67538c8f82..f24431743e 100644
--- a/otest/newlayout/tuscany-ws-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-ws-test-runner/pom.xml
@@ -31,27 +31,17 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-deployment</artifactId>
+            <artifactId>tuscany-osgi-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -59,17 +49,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-all</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-- 
cgit v1.2.3