TUSCANY-2878 - Moving tests to implementation-widget-runtime-tuscany and minor pom adjusts

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

12 files changed, 44 insertions, 38 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
index 3406586522..a9bbff3409 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-    <name>Apache Tuscany SCA Atom Feed Binding JavaScript</name>
+    <name>Apache Tuscany SCA Widget Implementation Runtime (Dojo)</name>
 
 	<dependencies>
 		<dependency>
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
index 5a2e5927d1..68200733f4 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-    <name>Apache Tuscany SCA Atom Feed Binding JavaScript</name>
+    <name>Apache Tuscany SCA Widget Implementation Runtime (Tuscany)</name>
 
 	<dependencies>
 		<dependency>
@@ -35,7 +35,49 @@
 			<artifactId>tuscany-implementation-widget-runtime</artifactId>
 			<version>1.5-SNAPSHOT</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+       <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+               
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>   
+        
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index 3b5c6f89b2..3b5c6f89b2 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java
index 370474f29f..370474f29f 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java
index bed053eeee..bed053eeee 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java
index 37e8d0161a..37e8d0161a 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/store.html b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
index 95b0d10a15..95b0d10a15 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
index 2e3d76d9a3..2e3d76d9a3 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
index 352dd85508..352dd85508 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/widget.composite b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
index e44a56e520..e44a56e520 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml b/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
index b90c156183..dd2d082277 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/pom.xml
@@ -54,27 +54,6 @@
             <version>1.5-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -82,21 +61,6 @@
             <scope>provided</scope>
         </dependency>
         
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-               
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>   
-        
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>