From 6d15abd42261cf2b9ae3d5b66bd9324c33697c9d Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 18 Feb 2009 13:22:29 +0000
Subject: Tidy up dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@745508 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/modules/host-webapp/META-INF/MANIFEST.MF  |  4 +---
 .../implementation-web/META-INF/MANIFEST.MF        | 13 ++++++++++-
 java/sca/modules/implementation-web/pom.xml        | 26 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
index ab42b3df1f..d3ff121453 100644
--- a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Export-Package: org.apache.tuscany.sca.host.webapp;version="2.0.0";
    org.apache.tuscany.sca.core,
    javax.servlet,
    org.apache.tuscany.sca.host.http,
-   javax.servlet.http",
- org.apache.tuscany.sca.host.webapp.jsp;version="2.0.0";
+   javax.servlet.http";
   uses:="javax.servlet,
    org.apache.tuscany.sca.host.embedded,
    javax.servlet.jsp.tagext,
@@ -29,7 +28,6 @@ Import-Package: javax.naming,
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.host.http;version="2.0.0",
  org.apache.tuscany.sca.host.webapp;version="2.0.0",
- org.apache.tuscany.sca.host.webapp.jsp;version="2.0.0",
  org.apache.tuscany.sca.node;version="2.0.0",
  org.oasisopen.sca;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp
diff --git a/java/sca/modules/implementation-web/META-INF/MANIFEST.MF b/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
index 133f552f32..3ba55911e7 100644
--- a/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
@@ -12,7 +12,18 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Implementation Web Model
 Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
  org.apache.tuscany.sca.implementation.web;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.web
 Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-web/pom.xml b/java/sca/modules/implementation-web/pom.xml
index 2265545ff5..f7d33f92a3 100644
--- a/java/sca/modules/implementation-web/pom.xml
+++ b/java/sca/modules/implementation-web/pom.xml
@@ -49,6 +49,32 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
  
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-definitions</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-- 
cgit v1.2.3