initial work to use the gemini web extender and set the classloading up propperly
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 940470e..67b8737 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -30,13 +30,12 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/WEB_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.D-20110201141522/org.eclipse.virgo.util.math-3.0.0.D-20110201141522.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.D-20110201141522/org.eclipse.virgo.util.math-sources-3.0.0.D-20110201141522.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110201141522/org.eclipse.virgo.util.io-3.0.0.D-20110201141522.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.D-20110201141522/org.eclipse.virgo.util.io-sources-3.0.0.D-20110201141522.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.dm"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110201141522/org.eclipse.virgo.util.osgi-3.0.0.D-20110201141522.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.deployer-3.0.0.D-20110202205730.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.deployer-sources-3.0.0.D-20110202205730.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.osgi-3.0.0.D-20110202205730.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.osgi-sources-3.0.0.D-20110202205730.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.core-3.0.0.D-20110202205730.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.core-sources-3.0.0.D-20110202205730.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110201141522/org.eclipse.virgo.util.common-3.0.0.D-20110201141522.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.core-1.2.0.BUILD-20110127170325.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.core-1.2.0.BUILD-20110127170325.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.core-sources-1.2.0.BUILD-20110127170325.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse/equinox-event/1.2.100.v20101208/equinox-event-1.2.100.v20101208.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110201140958/org.eclipse.virgo.teststubs.osgi-3.0.0.D-20110201140958.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110201141918/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.D-20110201141918.jar"/>
@@ -56,5 +55,6 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.D-20110201141222.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.D-20110201141222.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.0.0.D-20110201142541/org.eclipse.virgo.repository-3.0.0.D-20110201142541.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.extender/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.extender-1.2.0.BUILD-20110127170325.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.extender/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.extender-sources-1.2.0.BUILD-20110127170325.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.web.core/ivy.xml b/org.eclipse.virgo.web.core/ivy.xml
index c3840cb..ded8aef 100644
--- a/org.eclipse.virgo.web.core/ivy.xml
+++ b/org.eclipse.virgo.web.core/ivy.xml
@@ -26,7 +26,6 @@
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="${org.eclipse.virgo.kernel}" conf="provided->compile"/>
- <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.dm" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.artifact" rev="${org.eclipse.virgo.kernel}" conf="provided->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.core" rev="${org.eclipse.virgo.kernel}" conf="aspects, provided->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="${org.eclipse.virgo.kernel}" conf="provided->compile"/>
diff --git a/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebAppClassLoaderDelegateHook.java b/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebAppClassLoaderDelegateHook.java
index 426aaf4..4ae45c7 100644
--- a/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebAppClassLoaderDelegateHook.java
+++ b/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebAppClassLoaderDelegateHook.java
@@ -21,8 +21,6 @@
import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegateHook;
import org.osgi.framework.Bundle;
-import org.eclipse.gemini.web.core.WebApplication;
-
/**
* A {@link ClassLoaderDelegateHook} that delegates requests to a web application's
@@ -42,8 +40,8 @@
private final ThreadLocal<Object> delegationInProgress = new ThreadLocal<Object>();
- void addWebApplication(WebApplication webApplication, Bundle bundle) {
- this.webAppClassLoaders.put(bundle, webApplication.getClassLoader());
+ void addWebApplication(Bundle bundle, ClassLoader classLoader) {
+ this.webAppClassLoaders.put(bundle, classLoader);
}
void removeWebApplication(Bundle bundle) {
diff --git a/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListener.java b/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListener.java
index 36b64fc..f1a497c 100644
--- a/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListener.java
+++ b/org.eclipse.virgo.web.core/src/main/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListener.java
@@ -119,9 +119,9 @@
Bundle bundle = bundleInstallArtifact.getBundle();
this.webBundleInstallArtifacts.put(bundle, bundleInstallArtifact);
try {
- webApplication.start();
+ //webApplication.start();
- this.classLoaderDelegateHook.addWebApplication(webApplication, bundle);
+ this.classLoaderDelegateHook.addWebApplication(bundle, the classloader of the web application from tomcat. Should be a BundleWebappClassLoader instance);
String contextPath = getContextPath(webApplication);
getApplicationRegistry().registerWebApplication(contextPath, getApplicationName(installArtifact));
installArtifact.setProperty("org.eclipse.virgo.web.contextPath", contextPath);
@@ -133,6 +133,10 @@
}
}
+ public boolean isDeployed(Bundle webBundle){
+ return this.webBundleInstallArtifacts.containsKey(webBundle);
+ }
+
protected void webBundleDeployed(Bundle webBundle) {
BundleInstallArtifact installArtifact = this.webBundleInstallArtifacts.get(webBundle);
diff --git a/org.eclipse.virgo.web.core/src/test/java/.gitignore b/org.eclipse.virgo.web.core/src/test/java/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.virgo.web.core/src/test/java/.gitignore
+++ /dev/null
diff --git a/org.eclipse.virgo.web.core/src/test/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListenerTests.java b/org.eclipse.virgo.web.core/src/test/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListenerTests.java
index 32001dc..0dc797d 100644
--- a/org.eclipse.virgo.web.core/src/test/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListenerTests.java
+++ b/org.eclipse.virgo.web.core/src/test/java/org/eclipse/virgo/web/core/internal/WebBundleLifecycleListenerTests.java
@@ -90,7 +90,7 @@
this.listener.webBundleDeployed(installArtifact.getBundle());
assertEquals("foobar-1.0.0", this.webApplicationRegistry.getWebApplicationName("/"));
- assertTrue(webApplication.isStarted());
+ assertTrue(this.listener.isDeployed(installArtifact.getBundle()));
assertEquals("/", installArtifact.getProperty("org.eclipse.virgo.web.contextPath"));
verify(this.manifestTransformer);
@@ -144,7 +144,7 @@
this.listener.webBundleDeployed(installArtifact.getBundle());
assertEquals("foo-1.0.0", this.webApplicationRegistry.getWebApplicationName("/bar"));
- assertTrue(webApplication.isStarted());
+ assertTrue(this.listener.isDeployed(installArtifact.getBundle()));
assertEquals("/bar", installArtifact.getProperty("org.eclipse.virgo.web.contextPath"));
verify(this.manifestTransformer);
diff --git a/org.eclipse.virgo.web.test/ivy.xml b/org.eclipse.virgo.web.test/ivy.xml
index 73c8e70..7cddc94 100644
--- a/org.eclipse.virgo.web.test/ivy.xml
+++ b/org.eclipse.virgo.web.test/ivy.xml
@@ -37,6 +37,7 @@
<dependency org="com.dumbster" name="com.springsource.com.dumbster.smtp" rev="${com.dumbster}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="test->compile"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
+ <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.extender" rev="${org.eclipse.gemini.web}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="test->runtime"/>
diff --git a/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
index 8eb890e..b5f87e4 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -1,18 +1,67 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.virgo.web.test;version="2.0.0";uses:="org.
- apache.commons.httpclient,org.eclipse.virgo.kernel.deployer.core,org.
- eclipse.virgo.util.io,org.junit,org.junit.runner"
+Export-Package: about_files;version="3.0.0",org.apache.felix.scr;versi
+ on="3.0.0";uses:="org.osgi.framework,org.osgi.service.component",org.
+ eclipse.equinox.internal.ds;version="3.0.0";uses:="org.apache.felix.s
+ cr,org.eclipse.equinox.internal.ds.impl,org.eclipse.equinox.internal.
+ ds.model,org.eclipse.equinox.internal.util.pool,org.eclipse.equinox.i
+ nternal.util.timer,org.eclipse.osgi.framework.console,org.eclipse.osg
+ i.service.debug,org.eclipse.osgi.util,org.osgi.framework,org.osgi.ser
+ vice.cm,org.osgi.service.component",org.eclipse.equinox.internal.ds.i
+ mpl;version="3.0.0";uses:="org.eclipse.equinox.internal.ds,org.eclips
+ e.equinox.internal.ds.model,org.osgi.framework,org.osgi.service.compo
+ nent",org.eclipse.equinox.internal.ds.model;version="3.0.0";uses:="or
+ g.apache.felix.scr,org.eclipse.equinox.internal.ds,org.eclipse.equino
+ x.internal.ds.impl,org.eclipse.equinox.internal.util.io,org.eclipse.e
+ quinox.internal.util.xml,org.osgi.framework,org.osgi.service.componen
+ t",org.eclipse.equinox.internal.ds.storage.file;version="3.0.0";uses:
+ ="org.eclipse.equinox.internal.ds,org.osgi.framework",org.eclipse.equ
+ inox.internal.util;version="3.0.0";uses:="org.eclipse.equinox.interna
+ l.util.hash,org.osgi.framework",org.eclipse.equinox.internal.util.eve
+ nt;version="3.0.0",org.eclipse.equinox.internal.util.hash;version="3.
+ 0.0",org.eclipse.equinox.internal.util.impl.tpt;version="3.0.0";uses:
+ ="org.eclipse.equinox.internal.util.ref,org.osgi.framework",org.eclip
+ se.equinox.internal.util.impl.tpt.threadpool;version="3.0.0";uses:="o
+ rg.eclipse.equinox.internal.util.impl.tpt,org.eclipse.equinox.interna
+ l.util.pool,org.eclipse.equinox.internal.util.ref,org.eclipse.equinox
+ .internal.util.threadpool,org.eclipse.equinox.internal.util.timer",or
+ g.eclipse.equinox.internal.util.impl.tpt.timer;version="3.0.0";uses:=
+ "org.eclipse.equinox.internal.util.impl.tpt,org.eclipse.equinox.inter
+ nal.util.impl.tpt.threadpool,org.eclipse.equinox.internal.util.pool,o
+ rg.eclipse.equinox.internal.util.ref,org.eclipse.equinox.internal.uti
+ l.timer",org.eclipse.equinox.internal.util.io;version="3.0.0",org.ecl
+ ipse.equinox.internal.util.pool;version="3.0.0",org.eclipse.equinox.i
+ nternal.util.ref;version="3.0.0";uses:="org.eclipse.equinox.internal.
+ util.hash,org.eclipse.equinox.internal.util.security,org.eclipse.equi
+ nox.internal.util.timer,org.osgi.framework,org.osgi.service.log,org.o
+ sgi.util.tracker",org.eclipse.equinox.internal.util.security;version=
+ "3.0.0";uses:="org.eclipse.equinox.internal.util.pool,org.osgi.framew
+ ork",org.eclipse.equinox.internal.util.string;version="3.0.0",org.ecl
+ ipse.equinox.internal.util.threadpool;version="3.0.0",org.eclipse.equ
+ inox.internal.util.timer;version="3.0.0",org.eclipse.equinox.internal
+ .util.xml;version="3.0.0";uses:="org.eclipse.equinox.internal.util.st
+ ring",org.eclipse.equinox.internal.util.xml.impl;version="3.0.0";uses
+ :="org.eclipse.equinox.internal.util.string,org.eclipse.equinox.inter
+ nal.util.xml",org.eclipse.virgo.web.test;version="3.0.0";uses:="org.a
+ pache.commons.httpclient,org.eclipse.virgo.kernel.deployer.core,org.e
+ clipse.virgo.util.io,org.junit,org.junit.runner"
+Bundle-ClassPath: .,equinox-ds-1.2.100.v20101206.jar,equinox-util-1.0.
+ 200.v20100503.jar
Bundle-Version: 3.0.0
Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Virgo Web Test Bundle
Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.web.test
Import-Package: javax.management;version="0",org.apache.commons.httpcl
ient;version="[3.1.0,4)",org.apache.commons.httpclient.methods;versio
- n="[3.1.0,4)",org.eclipse.virgo.kernel.deployer.core;version="[2.2.0,
- 3.3)",org.eclipse.virgo.kernel.model.management;version="[2.2.0,3.3)"
- ,org.eclipse.virgo.kernel.osgi.framework;version="[2.2.0,3.3)",org.ec
- lipse.virgo.util.io;version="[2.2.0,3.3)",org.junit;version="[4.7.0,5
- )",org.junit.runner;version="[4.7.0,5)",org.osgi.framework;version="0
- "
-Bundle-SymbolicName: org.eclipse.virgo.web.test
+ n="[3.1.0,4)",org.eclipse.osgi.framework.console;version="0",org.ecli
+ pse.osgi.framework.log;version="0",org.eclipse.osgi.service.debug;ver
+ sion="0",org.eclipse.osgi.service.environment;version="0",org.eclipse
+ .osgi.util;version="0",org.eclipse.virgo.kernel.deployer.core;version
+ ="[3.0.0,4)",org.eclipse.virgo.kernel.model.management;version="[3.0.
+ 0,4)",org.eclipse.virgo.kernel.osgi.framework;version="[3.0.0,4)",org
+ .eclipse.virgo.util.io;version="[3.0.0,4)",org.junit;version="[4.7.0,
+ 5)",org.junit.runner;version="[4.7.0,5)",org.osgi.framework;version="
+ 0",org.osgi.service.cm;version="0",org.osgi.service.component;version
+ ="0",org.osgi.service.log;version="0",org.osgi.util.tracker;version="
+ 0"
diff --git a/org.eclipse.virgo.web.tomcat/.classpath b/org.eclipse.virgo.web.tomcat/.classpath
index eca11a2..7a43f7d 100644
--- a/org.eclipse.virgo.web.tomcat/.classpath
+++ b/org.eclipse.virgo.web.tomcat/.classpath
@@ -26,7 +26,7 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.core"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.0.D-20110201141522/org.eclipse.virgo.util.math-3.0.0.D-20110201141522.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.tomcat-1.2.0.BUILD-20110127170325.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.tomcat-1.2.0.BUILD-20110127170325.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.2.0.BUILD-20110127170325/org.eclipse.gemini.web.tomcat-sources-1.2.0.BUILD-20110127170325.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.osgi-3.0.0.D-20110202205730.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.0.0.D-20110202205730/org.eclipse.virgo.kernel.osgi-sources-3.0.0.D-20110202205730.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
diff --git a/org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan b/org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan
index 10757e1..a244491 100644
--- a/org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan
+++ b/org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan
@@ -7,6 +7,7 @@
<artifact type="bundle" name="org.eclipse.gemini.web.core" version="[1.0, 2.0)"/>
<artifact type="bundle" name="org.eclipse.gemini.web.tomcat" version="[1.0, 2.0)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.web.extender" version="[1, 2)"/>
<artifact type="bundle" name="org.eclipse.virgo.web.core" version="[3.0, 4.0)"/>
<artifact type="bundle" name="org.eclipse.virgo.web.dm" version="[3.0, 4.0)"/>
<artifact type="bundle" name="org.eclipse.virgo.web.tomcat" version="[3.0, 4.0)"/>
