You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/03/17 19:26:20 UTC

svn commit: r924402 - /myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java

Author: lu4242
Date: Wed Mar 17 18:26:20 2010
New Revision: 924402

URL: http://svn.apache.org/viewvc?rev=924402&view=rev
Log:
MYFACES-2290 Add OSGi bundle information and bundle classloader / activator (trying to be nice with OSGi)

Modified:
    myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java

Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=924402&r1=924401&r2=924402&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Wed Mar 17 18:26:20 2010
@@ -152,6 +152,10 @@ public class WebXmlParser
         InputStream inStream = ClassUtils.getContextClassLoader().getResourceAsStream(systemId);
         if (inStream == null)
         {
+            inStream = this.getClass().getClassLoader().getResourceAsStream(systemId);
+        }
+        if (inStream == null)
+        {
             // there is no such entity
             return null;
         }