geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1004831 - /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
Date Tue, 05 Oct 2010 22:07:39 GMT
Author: djencks
Date: Tue Oct  5 22:07:39 2010
New Revision: 1004831

URL: http://svn.apache.org/viewvc?rev=1004831&view=rev
Log:
GERONIMO-5508 support accessing resources from jar files

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=1004831&r1=1004830&r2=1004831&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
Tue Oct  5 22:07:39 2010
@@ -296,7 +296,10 @@ public class GeronimoWebAppContext exten
         Bundle bundle = integrationContext.getBundle();
         URL url = BundleUtils.getEntry(bundle, uriInContext);
         if (url == null) {
-            return null;
+            url = bundle.getResource("META-INF/resources" + uriInContext);
+            if (url == null) {
+                return null;
+            }
         }
         if (uriInContext.endsWith("/")) {
             Enumeration<String> paths = BundleUtils.getEntryPaths(bundle, uriInContext);



Mime
View raw message