Author: awiner
Date: Thu Jul 13 13:45:02 2006
New Revision: 421705
URL: http://svn.apache.org/viewvc?rev=421705&view=rev
Log:
Fix InternalView loading - we were looking at
org.apache.myfaces.adf.InternalView.properties, but should have been looking at
org.apache.myfaces.adf.render.InternalView.properties (as per the Javadoc in
InternalView)
Added:
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/resources/META-INF/org.apache.myfaces.adf.render.InternalView.properties
- copied unchanged from r421674,
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/resources/META-INF/org.apache.myfaces.adf.InternalView.properties
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/resources/META-INF/org.apache.myfaces.adf.render.InternalView.properties
- copied unchanged from r421674,
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/resources/META-INF/org.apache.myfaces.adf.InternalView.properties
Removed:
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/resources/META-INF/org.apache.myfaces.adf.InternalView.properties
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/resources/META-INF/org.apache.myfaces.adf.InternalView.properties
Modified:
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/ViewHandlerImpl.java
Modified:
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/ViewHandlerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/ViewHandlerImpl.java?rev=421705&r1=421704&r2=421705&view=diff
==============================================================================
---
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/ViewHandlerImpl.java
(original)
+++
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/ViewHandlerImpl.java
Thu Jul 13 13:45:02 2006
@@ -393,7 +393,7 @@
//
- // Load the META-INF/org.apache.myfaces.adf.InternalView.properties
+ // Load the META-INF/org.apache.myfaces.adf.render.InternalView.properties
// files.
//
private void _loadInternalViews()
@@ -404,11 +404,21 @@
try
{
Enumeration en = loader.getResources(
+
"META-INF/org.apache.myfaces.adf.render.InternalView.properties");
+ while (en.hasMoreElements())
+ {
+ list.add((URL) en.nextElement());
+ }
+
+ // And, for some temporary backwards compatibility, also load
+ // the incorrect properties without "render"
+ en = loader.getResources(
"META-INF/org.apache.myfaces.adf.InternalView.properties");
while (en.hasMoreElements())
{
list.add((URL) en.nextElement());
}
+
// Reverse the list so it is in the proper order (most local
// entry "wins")
