You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/08/25 21:50:54 UTC
svn commit: r807783 - in /myfaces/core/trunk:
api/src/main/java/javax/faces/view/facelets/
impl/src/main/java/org/apache/myfaces/application/
impl/src/main/java/org/apache/myfaces/view/facelets/compiler/
impl/src/main/java/org/apache/myfaces/view/facel...
Author: mconcini
Date: Tue Aug 25 19:50:54 2009
New Revision: 807783
URL: http://svn.apache.org/viewvc?rev=807783&view=rev
Log:
MYFACES-2334 - first set of fixes
Removed:
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Location.java
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Tag.java
myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Tag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Tag.java?rev=807783&r1=807782&r2=807783&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Tag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Tag.java Tue Aug 25 19:50:54 2009
@@ -18,6 +18,8 @@
*/
package javax.faces.view.facelets;
+import javax.faces.view.Location;
+
/**
* Representation of a Tag in the Facelet definition
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java?rev=807783&r1=807782&r2=807783&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java Tue Aug 25 19:50:54 2009
@@ -21,6 +21,7 @@
import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
+import javax.faces.view.Location;
import javax.faces.view.facelets.FaceletContext;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=807783&r1=807782&r2=807783&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Tue Aug 25 19:50:54 2009
@@ -60,7 +60,20 @@
{
throw new InvalidViewIdException(viewId);
}
- return viewId;
+
+ try
+ {
+ return ((context.getExternalContext().getResource(viewId) != null) ? viewId : null);
+ }
+ catch (MalformedURLException e)
+ {
+ if (log.isErrorEnabled())
+ {
+ log.error("Caught malformed URL exception attempting to validate the view resource",e);
+ }
+ }
+
+ return null; // return null if no physical resource exists
}
public String calculateActionURL(FacesContext context, String viewId)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java?rev=807783&r1=807782&r2=807783&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java Tue Aug 25 19:50:54 2009
@@ -29,7 +29,7 @@
import javax.faces.FacesException;
import javax.faces.view.facelets.FaceletException;
import javax.faces.view.facelets.FaceletHandler;
-import javax.faces.view.facelets.Location;
+import javax.faces.view.Location;
import javax.faces.view.facelets.Tag;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributes;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java?rev=807783&r1=807782&r2=807783&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java Tue Aug 25 19:50:54 2009
@@ -23,7 +23,7 @@
import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.Location;
+import javax.faces.view.Location;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributeException;