commit 734f2bcae17d2e14cb5c8902932cf73057f4c697
author Jan Bartel <janb@intalio.com> Tue Apr 24 18:16:11 2012 +1000
committer Jan Bartel <janb@intalio.com> Tue Apr 24 18:16:11 2012 +1000
tree 892d4d19a327d8e665755203a201f7c3eb105a2e
parent 25bc28c54537916011279da1c2da3a4096b75b46

371853 Support bundleentry: protocol for webapp embedded as directory in osgi bundle

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java

diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
index a681396..67f5ccb 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
@@ -241,7 +241,10 @@
             // classes
             // that the contributor gives access to.
             Thread.currentThread().setContextClassLoader(composite);
-
+            
+            //converts bundleentry: protocol 
+            baseWebappInstallURL = DefaultFileLocatorHelper.getLocalURL(baseWebappInstallURL);
+            
             context.setWar(baseWebappInstallURL.toString());
             context.setContextPath(contextPath);
             context.setExtraClasspath(extraClasspath);