aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-06-10 09:33:22 (EDT)
committerGlyn Normington2010-06-10 09:33:22 (EDT)
commitf1432ceb8b9e44437605f60814db2ef7fc95c8fe (patch)
treeafffdedaccd039ebe7ebabc62d85dd6c3c71d02b
parentfa31519c1d230aa2fb2b762b922048036562b06b (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-f1432ceb8b9e44437605f60814db2ef7fc95c8fe.zip
org.eclipse.gemini.web.gemini-web-container-f1432ceb8b9e44437605f60814db2ef7fc95c8fe.tar.gz
org.eclipse.gemini.web.gemini-web-container-f1432ceb8b9e44437605f60814db2ef7fc95c8fe.tar.bz2
Revert "Merge branch 'master' of ssh://git.eclipse.org/gitroot/gemini.web/org.eclipse.gemini.web.gemini-web-container"
-rw-r--r--org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.gemini.web.extender/src/test/resources/META-INF/TEST.MF2
-rw-r--r--org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF28
-rw-r--r--org.eclipse.gemini.web.tomcat/src/test/resources/META-INF/TEST.MF2
m---------virgo-build0
6 files changed, 35 insertions, 8 deletions
diff --git a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
index cbad3cf..bb3a46b 100644
--- a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
Manifest-Version: 1
Export-Package: org.eclipse.gemini.web.extender;version="1";uses:="org
- .eclipse.gemini.web.core"
+ .eclipse.gemini.web.core,org.osgi.framework,org.osgi.util.tracker"
Bundle-Version: 1
Tool: Bundlor 1.0.0.M6
Bundle-Name: SpringSource OSGi Web Container Extender
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.extender.ExtenderActivator
Bundle-SymbolicName: org.eclipse.gemini.web.extender
-Import-Package: org.eclipse.gemini.web.core;version="1.0"
+Import-Package: org.eclipse.gemini.web.core;version="1.0",org.osgi.fra
+ mework;version="0",org.osgi.util.tracker;version="1.4.2"
diff --git a/org.eclipse.gemini.web.extender/src/test/resources/META-INF/TEST.MF b/org.eclipse.gemini.web.extender/src/test/resources/META-INF/TEST.MF
index 3ec0672..38ab879 100644
--- a/org.eclipse.gemini.web.extender/src/test/resources/META-INF/TEST.MF
+++ b/org.eclipse.gemini.web.extender/src/test/resources/META-INF/TEST.MF
@@ -1,3 +1,5 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Import-Package: javax.servlet;version="2.5",junit.framework,org.eclips
+ e.virgo.teststubs.osgi.framework,org.junit
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
index 0528823..72c89fd 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -3,6 +3,10 @@ Bundle-Version: 1.0
Tool: Bundlor 1.0.0.M6
Bundle-Name: Web Container Tests
Bundle-ManifestVersion: 2
-Import-Package: org.eclipse.gemini.web.core.spi;version="0"
+Import-Package: javax.servlet;version="0",junit.framework;version="0",
+ org.eclipse.gemini.web.core.spi;version="0",org.eclipse.virgo.test.fr
+ amework;version="0",org.eclipse.virgo.util.io;version="0",org.junit;v
+ ersion="0",org.junit.runner;version="0",org.osgi.framework;version="0
+ "
Bundle-SymbolicName: org.eclipse.gemini.web.test
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
index 55fcd80..4c796d2 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.gemini.web.tomcat.spi;version="1"
+Export-Package: org.eclipse.gemini.web.tomcat.spi;version="1";uses:="o
+ rg.osgi.framework"
Bundle-Version: 1
Tool: Bundlor 1.0.0.M6
Bundle-Name: SpringSource OSGi Web Container Tomcat Bootstrap
@@ -7,8 +8,25 @@ Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator
Bundle-SymbolicName: org.eclipse.gemini.web.tomcat
Import-Package: javax.management;version="0",javax.naming;version="0",
- javax.naming.directory;version="0",org.apache.catalina.deploy;version
- ="6.0.20.S2-r5956",org.apache.juli.logging;version="6.0.20.S2-r5956",
- org.eclipse.gemini.web.core;version="1.0",org.eclipse.gemini.web.core
- .spi;version="1.0"
+ javax.naming.directory;version="0",javax.servlet;version="2.5",org.ap
+ ache.catalina;version="6.0.20.S2-r5956",org.apache.catalina.connector
+ ;version="6.0.20.S2-r5956",org.apache.catalina.core;version="6.0.20.S
+ 2-r5956",org.apache.catalina.deploy;version="6.0.20.S2-r5956",org.apa
+ che.catalina.startup;version="6.0.20.S2-r5956",org.apache.catalina.ut
+ il;version="6.0.20.S2-r5956",org.apache.juli.logging;version="6.0.20.
+ S2-r5956",org.apache.naming;version="6.0.20.S2-r5956",org.apache.nami
+ ng.resources;version="6.0.20.S2-r5956",org.apache.tomcat;version="6.0
+ .20.S2-r5956",org.apache.tomcat.util;version="6.0.20.S2-r5956",org.ap
+ ache.tomcat.util.digester;version="6.0.20.S2-r5956",org.apache.tomcat
+ .util.modeler;version="6.0.20.S2-r5956",org.eclipse.gemini.web.core;v
+ ersion="1.0",org.eclipse.gemini.web.core.spi;version="1.0",org.eclips
+ e.osgi.baseadaptor;version="0";resolution:="optional",org.eclipse.osg
+ i.baseadaptor.bundlefile;version="0";resolution:="optional",org.eclip
+ se.osgi.framework.adaptor;version="0";resolution:="optional",org.ecli
+ pse.osgi.framework.internal.core;version="0";resolution:="optional",o
+ rg.eclipse.virgo.util.io;version="2.0",org.eclipse.virgo.util.osgi;ve
+ rsion="2.0",org.osgi.framework;version="0",org.osgi.service.packagead
+ min;version="1.0",org.osgi.service.url;version="1.0",org.osgi.util.tr
+ acker;version="1.4.2",org.slf4j;version="1.5.10",org.springframework.
+ osgi.util;version="1.2.0",org.xml.sax;version="0"
diff --git a/org.eclipse.gemini.web.tomcat/src/test/resources/META-INF/TEST.MF b/org.eclipse.gemini.web.tomcat/src/test/resources/META-INF/TEST.MF
index 3ec0672..bf010d6 100644
--- a/org.eclipse.gemini.web.tomcat/src/test/resources/META-INF/TEST.MF
+++ b/org.eclipse.gemini.web.tomcat/src/test/resources/META-INF/TEST.MF
@@ -1,3 +1,5 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Import-Package: org.easymock,org.eclipse.virgo.teststubs.osgi.framewor
+ k,org.junit
diff --git a/virgo-build b/virgo-build
-Subproject 84c9bb92826f87e37a9ba2d2831d5851b5ce9de
+Subproject 5a215bb9062764bba1f420d70d0531cb47e3b7c