summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-09 13:11:42 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-09 13:11:42 +0000
commit54614d93e734ada99efa07a6e3800eb5d384c282 (patch)
tree69f3074e83dc5bc1e23c6d19e8daec8e6894d3c2 /java
parent3aa78814d7d604bb0cf214d103b14fcdd98bd7b1 (diff)
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
Diffstat (limited to 'java')
-rw-r--r--java/sca/shades/base/pom.xml23
-rw-r--r--java/sca/shades/webservices/pom.xml9
2 files changed, 23 insertions, 9 deletions
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
@@ -105,10 +105,6 @@
<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>
</exclusion>
@@ -133,10 +129,6 @@
<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>
</exclusion>
@@ -158,7 +150,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
<build>