From e0e7ee6fdf209d337225fa3f901f496e178a309d Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 18 Feb 2009 18:43:06 +0000
Subject: Fix the invalid MANIFEST.MF

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

(limited to 'java/sca/modules')

diff --git a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
index d3ff121453..9b394c6a0b 100644
--- a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
@@ -1,18 +1,6 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.host.webapp;version="2.0.0";
-  uses:="javax.naming,
-   org.apache.tuscany.sca.host.embedded.impl,
-   org.apache.tuscany.sca.host.embedded,
-   org.apache.tuscany.sca.core,
-   javax.servlet,
-   org.apache.tuscany.sca.host.http,
-   javax.servlet.http";
-  uses:="javax.servlet,
-   org.apache.tuscany.sca.host.embedded,
-   javax.servlet.jsp.tagext,
-   org.apache.tuscany.sca.host.webapp,
-   org.oasisopen.sca,
-   javax.servlet.jsp"
+ uses:="javax.servlet,org.apache.tuscany.sca.host.http,org.apache.tuscany.sca.core"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Webapp Host
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
diff --git a/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
index 808e93ec2f..43588ae831 100644
--- a/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
@@ -10,4 +10,16 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Implementation Web Runtime
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.web.runtime
 Bundle-DocURL: http://www.apache.org/
+Import-Package: javax.servlet,
+ javax.servlet.jsp,
+ javax.servlet.jsp.tagext,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.web;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
+ org.apache.tuscany.sca.provider;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0"
 
diff --git a/java/sca/modules/implementation-web-runtime/pom.xml b/java/sca/modules/implementation-web-runtime/pom.xml
index 1f4c619915..f1bcf49758 100644
--- a/java/sca/modules/implementation-web-runtime/pom.xml
+++ b/java/sca/modules/implementation-web-runtime/pom.xml
@@ -77,13 +77,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/java/sca/modules/implementation-web/META-INF/MANIFEST.MF b/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
index 3ba55911e7..4fed82e56e 100644
--- a/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
@@ -12,15 +12,12 @@ 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;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",
-- 
cgit v1.2.3