You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/11/22 23:52:16 UTC
svn commit: r478359 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
config/TobagoConfigParser.java context/ThemeParser.java
Author: bommel
Date: Wed Nov 22 14:52:15 2006
New Revision: 478359
URL: http://svn.apache.org/viewvc?view=rev&rev=478359
Log:
(TOBAGO-195) Digester in Tobago should use ContextClassloader
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java?view=diff&rev=478359&r1=478358&r2=478359
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java Wed Nov 22 14:52:15 2006
@@ -43,14 +43,14 @@
throws IOException, SAXException, FacesException {
TobagoConfig tobagoConfig = new TobagoConfig();
- Digester digester = new Digester();
- configure(tobagoConfig, digester);
+ Digester digester = configure(tobagoConfig);
parse(context, digester);
return tobagoConfig;
}
- private Digester configure(TobagoConfig config, Digester digester) {
-
+ private Digester configure(TobagoConfig config) {
+ Digester digester = new Digester();
+ digester.setUseContextClassLoader(true);
digester.push(config);
digester.setValidating(true);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java?view=diff&rev=478359&r1=478358&r2=478359
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java Wed Nov 22 14:52:15 2006
@@ -41,15 +41,14 @@
private Digester digester;
ThemeParser() {
- digester = new Digester();
configure();
}
- private Digester configure() {
-
-// todo digester.setValidating(true);
+ private void configure() {
+ digester = new Digester();
+ digester.setUseContextClassLoader(true);
+ // todo digester.setValidating(true);
digester.setValidating(false);
-
digester.addCallMethod("tobago-theme/name", "setName", 0);
digester.addCallMethod("tobago-theme/deprecated-name", "setDeprecatedName", 0);
digester.addCallMethod("tobago-theme/resource-path", "setResourcePath", 0);
@@ -62,8 +61,6 @@
digester.addObjectCreate("tobago-theme/renderers/renderer/supported-markup", MarkupConfig.class);
digester.addSetNext("tobago-theme/renderers/renderer/supported-markup", "setMarkupConfig");
digester.addCallMethod("tobago-theme/renderers/renderer/supported-markup/markup", "addMarkup" , 0);
-
- return digester;
}
public ThemeImpl parse(final URL url)