svn commit: r830718 - /myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java

[lu...@apache.org]

Author: lu4242
Date: Wed Oct 28 18:42:33 2009
New Revision: 830718

URL: http://svn.apache.org/viewvc?rev=830718&view=rev
Log:
MYFACES-2290 Add OSGi bundle information and bundle classloader / activator (Digester should use ClassUtils.getContextClassLoader() )

Modified:
    myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java

Modified: myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=830718&r1=830717&r2=830718&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Wed Oct 28 18:42:33 2009
@@ -21,12 +21,29 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+
 import javax.faces.context.ExternalContext;
 
+import org.apache.commons.digester.Digester;
 import org.apache.myfaces.config.FacesConfigUnmarshaller;
-import org.apache.myfaces.config.impl.digester.elements.*;
 import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
-import org.apache.commons.digester.Digester;
+import org.apache.myfaces.config.impl.digester.elements.Application;
+import org.apache.myfaces.config.impl.digester.elements.Attribute;
+import org.apache.myfaces.config.impl.digester.elements.Converter;
+import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
+import org.apache.myfaces.config.impl.digester.elements.Factory;
+import org.apache.myfaces.config.impl.digester.elements.ListEntries;
+import org.apache.myfaces.config.impl.digester.elements.LocaleConfig;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
+import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
+import org.apache.myfaces.config.impl.digester.elements.MapEntries;
+import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
+import org.apache.myfaces.config.impl.digester.elements.NavigationRule;
+import org.apache.myfaces.config.impl.digester.elements.Property;
+import org.apache.myfaces.config.impl.digester.elements.RenderKit;
+import org.apache.myfaces.config.impl.digester.elements.Renderer;
+import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -47,7 +64,8 @@
         digester.setValidating(false);
         digester.setNamespaceAware(true);
         digester.setEntityResolver(new FacesConfigEntityResolver(externalContext));
-        digester.setUseContextClassLoader(true);
+        //digester.setUseContextClassLoader(true);
+        digester.setClassLoader(ClassUtils.getContextClassLoader());
 
         digester.addObjectCreate("faces-config", FacesConfig.class);
         digester.addObjectCreate("faces-config/application", Application.class);