You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/03/09 14:28:50 UTC
svn commit: r920864 -
/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
Author: jakobk
Date: Tue Mar 9 13:28:49 2010
New Revision: 920864
URL: http://svn.apache.org/viewvc?rev=920864&view=rev
Log:
MYFACESTEST-3 Add configuration resource for Myfaces 1.2 to ConfigParser (Thanks to Rudy De Busscher for this patch)
Modified:
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java?rev=920864&r1=920863&r2=920864&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java Tue Mar 9 13:28:49 2010
@@ -85,6 +85,12 @@ public class ConfigParser {
{ "/org/apache/myfaces/resource/standard-faces-config.xml",
};
+ /**
+ * <p>Configuration resource URLs for Apache MyFaces 1.2.</p>
+ */
+ private static final String[] MYFACES_RESOURCES12 =
+ { "/META-INF/standard-faces-config.xml",
+ };
// ------------------------------------------------------ Instance Variables
@@ -113,7 +119,10 @@ public class ConfigParser {
URL[] urls = translate(JSFRI_RESOURCES);
if (urls[0] == null) {
- urls = translate(MYFACES_RESOURCES);
+ urls = translate(MYFACES_RESOURCES12);
+ if (urls[0] == null) {
+ urls = translate(MYFACES_RESOURCES);
+ }
}
return urls;