From bc1c8ab4c48c3a81824dac27ba71a8d1277797b9 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 4 Dec 2008 21:09:28 +0000
Subject: Merge itest changes from sca-equinox branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723439 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml | 9 ++-------
 java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml      | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'java/sca/itest/osgi-tuscany')

diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 1b763f205a..84f8cc015b 100644
--- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
@@ -33,11 +33,6 @@
         <tuscany.version>${pom.version}</tuscany.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-assembly</artifactId>
@@ -445,7 +440,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -537,7 +532,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
index f08acaa994..5804f4711d 100644
--- a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
@@ -34,11 +34,6 @@
 
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-assembly</artifactId>
@@ -446,7 +441,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -538,7 +533,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-- 
cgit v1.2.3