Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 344067 OSGi fragments can add static resources to a web-bundle. 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3038 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Hugues Malphettes 2011-04-28 04:07:33 +00:00
parent 496f9212a4
commit 225d76bdd6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
} }
fragUrl = DefaultFileLocatorHelper.getLocalURL(fragUrl); fragUrl = DefaultFileLocatorHelper.getLocalURL(fragUrl);
String key = patchFragFolder.startsWith("/") ? patchFragFolder.substring(1) : patchFragFolder; String key = patchFragFolder.startsWith("/") ? patchFragFolder.substring(1) : patchFragFolder;
patchResourcesPath.put(key + ";" + frag.getSymbolicName(), Resource.newResource(fragUrl)); appendedResourcesPath.put(key + ";" + frag.getSymbolicName(), Resource.newResource(fragUrl));
} }
if (patchFragFolder != null) if (patchFragFolder != null)
{ {
@ -266,7 +266,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
} }
patchFragUrl = DefaultFileLocatorHelper.getLocalURL(patchFragUrl); patchFragUrl = DefaultFileLocatorHelper.getLocalURL(patchFragUrl);
String key = patchFragFolder.startsWith("/") ? patchFragFolder.substring(1) : patchFragFolder; String key = patchFragFolder.startsWith("/") ? patchFragFolder.substring(1) : patchFragFolder;
appendedResourcesPath.put(key + ";" + frag.getSymbolicName(), Resource.newResource(patchFragUrl)); patchResourcesPath.put(key + ";" + frag.getSymbolicName(), Resource.newResource(patchFragUrl));
} }
} }