From 54614d93e734ada99efa07a6e3800eb5d384c282 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Nov 2009 13:11:42 +0000
Subject: Update to include http host support in base jar, and include some api
 jars in web services jar

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@834048 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/shades/base/pom.xml        | 23 +++++++++++++++++++++++
 java/sca/shades/webservices/pom.xml |  9 ---------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'java')

diff --git a/java/sca/shades/base/pom.xml b/java/sca/shades/base/pom.xml
index 2be39fa0c5..58f2c2cf4d 100644
--- a/java/sca/shades/base/pom.xml
+++ b/java/sca/shades/base/pom.xml
@@ -61,6 +61,29 @@
             <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>tuscany-core-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
 
 <!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->
diff --git a/java/sca/shades/webservices/pom.xml b/java/sca/shades/webservices/pom.xml
index 43d7a90a13..852aca5ece 100644
--- a/java/sca/shades/webservices/pom.xml
+++ b/java/sca/shades/webservices/pom.xml
@@ -104,10 +104,6 @@
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jms_1.1_spec</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>javax.mail</groupId>
                     <artifactId>mail</artifactId>
@@ -132,10 +128,6 @@
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
@@ -158,7 +150,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
 
     <build>
-- 
cgit v1.2.3