switch to new distro structure

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1021754 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 44 insertions, 67 deletions

diff --git a/otest/newlayout/tuscany-java-caa-test-runner/pom.xml b/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
index 1b328625cd..14c2942df3 100644
--- a/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
@@ -29,35 +29,19 @@
     <name>Apache Tuscany SCA Specification Tests for SCA-J CAA</name>
 
     <dependencies>
-    	<dependency>
-    		<groupId>org.apache.tuscany.sca</groupId>
-    		<artifactId>tuscany-sca-client-impl</artifactId>
-    		<version>2.0-SNAPSHOT</version>
-    	</dependency>
-    	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-base-runtime</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>
-        </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>
+            <type>pom</type>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -159,6 +143,7 @@
                                     <property name="to.file" value="src/main/resources/TestClient.wsdl"/>
                                     <target name="copyFile"/>
                                 </ant>
+<!--
                                 <ant antfile="../build.xml">
                                     <property name="zip.file" value="../sca-java-caa/JCA_GENERAL_POJO/target/JCA_GENERAL_POJO.zip"/>
                                     <property name="target.file" value="sca_variables.dtd"/>
@@ -166,6 +151,7 @@
                                     <property name="target.token" value="default"/>
                                     <target name="updateTestArtifact"/>
                                 </ant>
+-->
                             </tasks>
                         </configuration>
                     </execution>
@@ -189,8 +175,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-test-runner/pom.xml b/otest/newlayout/tuscany-test-runner/pom.xml
index 6ea139235c..accd371d97 100644
--- a/otest/newlayout/tuscany-test-runner/pom.xml
+++ b/otest/newlayout/tuscany-test-runner/pom.xml
@@ -31,72 +31,36 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-base-runtime</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>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
-         <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 
-     Local repo. 
-        <dependency>
-            <groupId>org.oasis-open.sca.assembly</groupId>
-            <artifactId>General_Java</artifactId>
-            <version>1.0</version>
-        </dependency>
--->
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-
+        <!-- Not sure why this is required for ASM. But ASM_6039 & ASM_6036 fail without it --> 
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
             <version>2.1.7</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>junit</groupId>