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 2011/10/22 19:59:37 UTC
svn commit: r1187741 [1/11] - in /myfaces/shared/trunk: ./
core/src/main/java/org/apache/myfaces/shared/
core/src/main/java/org/apache/myfaces/shared/application/
core/src/main/java/org/apache/myfaces/shared/component/
core/src/main/java/org/apache/myf...
Author: bommel
Date: Sat Oct 22 17:59:32 2011
New Revision: 1187741
URL: http://svn.apache.org/viewvc?rev=1187741&view=rev
Log:
ensure svn:eol-style and svn:keywords
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/FacesServletMapping.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ResponseWriterWrapper.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/el/SimpleActionMethodBinding.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/readme.txt (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyConstants.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ClassLoaderResourceLoader.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerSupport.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceMeta.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlFormELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlFormTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlGraphicImageELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlGraphicImageTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputHiddenELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputHiddenTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputSecretELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputSecretTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputTextELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputTextTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputTextareaELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlInputTextareaTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlMessageELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlMessageTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlMessagesELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlMessagesTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputFormatELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputFormatTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLinkELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLinkTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputTextELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputTextTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlPanelGridELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlPanelGridTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlPanelGroupELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlPanelGroupTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectBooleanCheckboxELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectBooleanCheckboxTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectListboxELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectListboxTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectManyCheckboxELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectManyCheckboxTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectMenuELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectMenuTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectOneRadioELTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlSelectOneRadioTagBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ArrayUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderExtension.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/CommentUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/FastWriter.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesClassLoader.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/NullIterator.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RequestType.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/StringUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/_EmptyIterator.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/GenericMap.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/serial/DefaultSerialFactory.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/serial/SerialFactory.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/xml/XmlUtils.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java (contents, props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewResponseWrapper.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/DelegatedFacesServlet.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (props changed)
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (props changed)
myfaces/shared/trunk/core/src/main/resources/META-INF/LICENSE.txt (contents, props changed)
myfaces/shared/trunk/core/src/main/resources/META-INF/NOTICE.txt (contents, props changed)
myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupportTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/RendererUtilsTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoderTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/CommentUtilsTest.java (contents, props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java (props changed)
myfaces/shared/trunk/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java (props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_ca.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_de.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_en.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_es.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_fr.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_it.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_ja.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_mt.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_nl.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_pt_BR.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_ru.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/javax/faces/Messages_zh_CN.properties (contents, props changed)
myfaces/shared/trunk/core/src/test/resources/org/apache/myfaces/shared/application/view1.jsp (contents, props changed)
myfaces/shared/trunk/pom.xml (props changed)
myfaces/shared/trunk/src/site/resources/css/site.css (contents, props changed)
myfaces/shared/trunk/src/site/resources/images/easter.png (props changed)
myfaces/shared/trunk/src/site/resources/images/h3.jpg (props changed)
myfaces/shared/trunk/src/site/resources/images/myfaces-logo.png (props changed)
myfaces/shared/trunk/src/site/site.xml (props changed)
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java Sat Oct 22 17:59:32 2011
@@ -38,8 +38,8 @@ import org.apache.myfaces.shared.util.We
* A ViewHandlerSupport implementation for use with standard Java Servlet engines,
* ie an engine that supports javax.servlet, and uses a standard web.xml file.
*
- * @author Mathias Broekelmann (latest modification by $Author: lu4242 $)
- * @version $Revision: 887436 $ $Date: 2009-12-04 16:11:25 -0700 (Fri, 04 Dec 2009) $
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class DefaultViewHandlerSupport implements ViewHandlerSupport
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/FacesServletMapping.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/FacesServletMapping.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java Sat Oct 22 17:59:32 2011
@@ -19,8 +19,8 @@
package org.apache.myfaces.shared.application;
/**
- * @author Mathias Broekelmann (latest modification by $Author: mbr $)
- * @version $Revision: 517404 $ $Date: 2007-03-12 15:17:24 -0600 (Mon, 12 Mar 2007) $
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class InvalidViewIdException extends RuntimeException
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/InvalidViewIdException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java Sat Oct 22 17:59:32 2011
@@ -29,8 +29,8 @@ import javax.faces.context.FacesContext;
* For example, an implementation of this interface might support javax.servlet,
* javax.portlet, or some other mechanism.
*
- * @author Mathias Broekelmann (latest modification by $Author: lu4242 $)
- * @version $Revision: 887436 $ $Date: 2009-12-04 16:11:25 -0700 (Fri, 04 Dec 2009) $
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public interface ViewHandlerSupport
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/application/ViewHandlerSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/BindingAware.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java Sat Oct 22 17:59:32 2011
@@ -24,10 +24,10 @@ package org.apache.myfaces.shared.compon
* When displayValueOnly is true, the renderer should not render any input widget.
* Only the text corresponding to the component's value should be rendered instead.
*
- * @author Sylvain Vieujot (latest modification by $Author: svieujot $)
+ * @author Sylvain Vieujot (latest modification by $Author$)
* @author Martin Marinschek
*
- * @version $Revision: 169739 $ $Date: 2005-05-12 02:45:14 +0200 (Thu, 12 May 2005) $
+ * @version $Revision$ $Date$
*/
public interface DisplayValueOnlyCapable
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/DisplayValueOnlyCapable.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java Sat Oct 22 17:59:32 2011
@@ -23,7 +23,7 @@ package org.apache.myfaces.shared.compon
* By default, escape is true, and the components have the default behaviour.
* When escape is false, the renderer should not escape output.
*
- * @author Grant Smith (latest modification by $Author: grantsmith $)
+ * @author Grant Smith (latest modification by $Author$)
*/
public interface EscapeCapable {
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/component/EscapeCapable.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Oct 22 17:59:32 2011
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java Sat Oct 22 17:59:32 2011
@@ -1,339 +1,339 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.context;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.el.ELException;
-import javax.faces.FacesException;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.PartialResponseWriter;
-import javax.faces.context.PartialViewContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.SystemEvent;
-
-/**
- *
- * Specialized Ajax Handler, according to JSF 2.0 rev A section 13.3.7.
- *
- * @author Leonardo Uribe
- *
- */
-public class AjaxExceptionHandlerImpl extends ExceptionHandler
-{
- //The spec says this related to exception handling in ajax requests:
- //
- //"... JavaServer Faces Ajax frameworks must ensure exception information
- // is written to the response in the format:
- //
- //<partial-response>
- // <error>
- // <error-name>...</error-name>
- // <error-message>...</error-message>
- // </error>
- //</partial-response>
- //
- //Implementations must ensure that an ExceptionHandler suitable for writing
- //exceptions to the partial response is installed if the current request
- //required an Ajax response (PartialViewContext.isAjaxRequest() returns true)
- //
- //Implementations may choose to include a specialized ExceptionHandler for
- //Ajax that extends from javax.faces.context.ExceptionHandlerWrapper, and
- //have the javax.faces.context.ExceptionHandlerFactory implementation
- //install it if the environment requires it. ..."
-
- private static final Logger log = Logger.getLogger(AjaxExceptionHandlerImpl.class.getName());
-
- private Queue<ExceptionQueuedEvent> handled;
- private Queue<ExceptionQueuedEvent> unhandled;
- private ExceptionQueuedEvent handledAndThrown;
-
- public AjaxExceptionHandlerImpl()
- {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ExceptionQueuedEvent getHandledExceptionQueuedEvent()
- {
- return handledAndThrown;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
- {
- return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Throwable getRootCause(Throwable t)
- {
- if (t == null)
- {
- throw new NullPointerException("t");
- }
-
- while (t != null)
- {
- Class<?> clazz = t.getClass();
- if (!clazz.equals(FacesException.class) && !clazz.equals(ELException.class))
- {
- return t;
- }
-
- t = t.getCause();
- }
-
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
- {
- return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void handle() throws FacesException
- {
- if (unhandled != null && !unhandled.isEmpty())
- {
- if (handled == null)
- {
- handled = new LinkedList<ExceptionQueuedEvent>();
- }
-
- List<Throwable> throwableList = new ArrayList<Throwable>();
- FacesContext facesContext = null;
-
- do
- {
- // For each ExceptionEvent in the list
-
- // get the event to handle
- ExceptionQueuedEvent event = unhandled.peek();
- try
- {
- // call its getContext() method
- ExceptionQueuedEventContext context = event.getContext();
-
- if (facesContext == null)
- {
- facesContext = event.getContext().getContext();
- }
-
- // and call getException() on the returned result
- Throwable exception = context.getException();
-
- // Upon encountering the first such Exception that is not an instance of
- // javax.faces.event.AbortProcessingException
- if (!shouldSkip(exception))
- {
- // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
- handledAndThrown = event;
-
- Throwable rootCause = getRootCause(exception);
-
- throwableList.add(rootCause == null ? exception : rootCause);
-
- //break;
- }
- else
- {
- // Testing mojarra it logs a message and the exception
- // however, this behaviour is not mentioned in the spec
- log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
- (context.inBeforePhase() ? "beforePhase() of " :
- (context.inAfterPhase() ? "afterPhase() of " : "")) +
- "phase " + context.getPhaseId() + ": " +
- "UIComponent-ClientId=" +
- (context.getComponent() != null ?
- context.getComponent().getClientId(context.getContext()) : "") + ", " +
- "Message=" + exception.getMessage());
-
- log.log(Level.SEVERE, exception.getMessage(), exception);
- }
- }
- finally
- {
- // if we will throw the Exception or if we just logged it,
- // we handled it in either way --> add to handled
- handled.add(event);
- unhandled.remove(event);
- }
- } while (!unhandled.isEmpty());
-
- if (!throwableList.isEmpty())
- {
- PartialResponseWriter partialWriter = null;
- boolean responseComplete = false;
-
- //Retrieve the partial writer used to render the exception
- if (facesContext == null)
- {
- facesContext = FacesContext.getCurrentInstance();
- }
-
- facesContext = (facesContext == null) ? FacesContext.getCurrentInstance() : facesContext;
- ExternalContext externalContext = facesContext.getExternalContext();
-
- //Clean up the response if by some reason something has been written before.
- if (!facesContext.getExternalContext().isResponseCommitted())
- {
- facesContext.getExternalContext().responseReset();
- }
-
- PartialViewContext partialViewContext = facesContext.getPartialViewContext();
- partialWriter = partialViewContext.getPartialResponseWriter();
-
- // ajax request --> xml error page
- externalContext.setResponseContentType("text/xml");
- externalContext.setResponseCharacterEncoding("UTF-8");
- externalContext.addResponseHeader("Cache-control", "no-cache");
-
- try
- {
- partialWriter.startDocument();
-
- for (Throwable t : throwableList)
- {
- renderAjaxError(partialWriter, t);
- }
-
- responseComplete = true;
- }
- catch (IOException e)
- {
- if (log.isLoggable(Level.SEVERE))
- {
- log.log(Level.SEVERE, "Cannot render exception on ajax request", e);
- }
- }
- finally
- {
- if (responseComplete)
- {
- try
- {
- partialWriter.endDocument();
- facesContext.responseComplete();
- }
- catch (IOException e1)
- {
- if (log.isLoggable(Level.SEVERE))
- {
- log.log(Level.SEVERE, "Cannot render exception on ajax request", e1);
- }
- }
- }
- }
- }
- }
- }
-
- private void renderAjaxError(PartialResponseWriter partialWriter, Throwable ex) throws IOException
- {
- partialWriter.startError(ex.getClass().getName());
- if (ex.getCause() != null)
- {
- partialWriter.write(ex.getCause().toString());
- }
- else if (ex.getMessage() != null)
- {
- partialWriter.write(ex.getMessage());
- }
- partialWriter.endError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isListenerForSource(Object source)
- {
- return source instanceof ExceptionQueuedEventContext;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void processEvent(SystemEvent exceptionQueuedEvent) throws AbortProcessingException
- {
- if (unhandled == null)
- {
- unhandled = new LinkedList<ExceptionQueuedEvent>();
- }
-
- unhandled.add((ExceptionQueuedEvent)exceptionQueuedEvent);
- }
-
- protected Throwable getRethrownException(Throwable exception)
- {
- // Let toRethrow be either the result of calling getRootCause() on the Exception,
- // or the Exception itself, whichever is non-null
- Throwable toRethrow = getRootCause(exception);
- if (toRethrow == null)
- {
- toRethrow = exception;
- }
-
- return toRethrow;
- }
-
- protected FacesException wrap(Throwable exception)
- {
- if (exception instanceof FacesException)
- {
- return (FacesException) exception;
- }
- return new FacesException(exception);
- }
-
- protected boolean shouldSkip(Throwable exception)
- {
- return exception instanceof AbortProcessingException;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.context;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.el.ELException;
+import javax.faces.FacesException;
+import javax.faces.context.ExceptionHandler;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.context.PartialResponseWriter;
+import javax.faces.context.PartialViewContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ExceptionQueuedEvent;
+import javax.faces.event.ExceptionQueuedEventContext;
+import javax.faces.event.SystemEvent;
+
+/**
+ *
+ * Specialized Ajax Handler, according to JSF 2.0 rev A section 13.3.7.
+ *
+ * @author Leonardo Uribe
+ *
+ */
+public class AjaxExceptionHandlerImpl extends ExceptionHandler
+{
+ //The spec says this related to exception handling in ajax requests:
+ //
+ //"... JavaServer Faces Ajax frameworks must ensure exception information
+ // is written to the response in the format:
+ //
+ //<partial-response>
+ // <error>
+ // <error-name>...</error-name>
+ // <error-message>...</error-message>
+ // </error>
+ //</partial-response>
+ //
+ //Implementations must ensure that an ExceptionHandler suitable for writing
+ //exceptions to the partial response is installed if the current request
+ //required an Ajax response (PartialViewContext.isAjaxRequest() returns true)
+ //
+ //Implementations may choose to include a specialized ExceptionHandler for
+ //Ajax that extends from javax.faces.context.ExceptionHandlerWrapper, and
+ //have the javax.faces.context.ExceptionHandlerFactory implementation
+ //install it if the environment requires it. ..."
+
+ private static final Logger log = Logger.getLogger(AjaxExceptionHandlerImpl.class.getName());
+
+ private Queue<ExceptionQueuedEvent> handled;
+ private Queue<ExceptionQueuedEvent> unhandled;
+ private ExceptionQueuedEvent handledAndThrown;
+
+ public AjaxExceptionHandlerImpl()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ExceptionQueuedEvent getHandledExceptionQueuedEvent()
+ {
+ return handledAndThrown;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
+ {
+ return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Throwable getRootCause(Throwable t)
+ {
+ if (t == null)
+ {
+ throw new NullPointerException("t");
+ }
+
+ while (t != null)
+ {
+ Class<?> clazz = t.getClass();
+ if (!clazz.equals(FacesException.class) && !clazz.equals(ELException.class))
+ {
+ return t;
+ }
+
+ t = t.getCause();
+ }
+
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
+ {
+ return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void handle() throws FacesException
+ {
+ if (unhandled != null && !unhandled.isEmpty())
+ {
+ if (handled == null)
+ {
+ handled = new LinkedList<ExceptionQueuedEvent>();
+ }
+
+ List<Throwable> throwableList = new ArrayList<Throwable>();
+ FacesContext facesContext = null;
+
+ do
+ {
+ // For each ExceptionEvent in the list
+
+ // get the event to handle
+ ExceptionQueuedEvent event = unhandled.peek();
+ try
+ {
+ // call its getContext() method
+ ExceptionQueuedEventContext context = event.getContext();
+
+ if (facesContext == null)
+ {
+ facesContext = event.getContext().getContext();
+ }
+
+ // and call getException() on the returned result
+ Throwable exception = context.getException();
+
+ // Upon encountering the first such Exception that is not an instance of
+ // javax.faces.event.AbortProcessingException
+ if (!shouldSkip(exception))
+ {
+ // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
+ handledAndThrown = event;
+
+ Throwable rootCause = getRootCause(exception);
+
+ throwableList.add(rootCause == null ? exception : rootCause);
+
+ //break;
+ }
+ else
+ {
+ // Testing mojarra it logs a message and the exception
+ // however, this behaviour is not mentioned in the spec
+ log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
+ (context.inBeforePhase() ? "beforePhase() of " :
+ (context.inAfterPhase() ? "afterPhase() of " : "")) +
+ "phase " + context.getPhaseId() + ": " +
+ "UIComponent-ClientId=" +
+ (context.getComponent() != null ?
+ context.getComponent().getClientId(context.getContext()) : "") + ", " +
+ "Message=" + exception.getMessage());
+
+ log.log(Level.SEVERE, exception.getMessage(), exception);
+ }
+ }
+ finally
+ {
+ // if we will throw the Exception or if we just logged it,
+ // we handled it in either way --> add to handled
+ handled.add(event);
+ unhandled.remove(event);
+ }
+ } while (!unhandled.isEmpty());
+
+ if (!throwableList.isEmpty())
+ {
+ PartialResponseWriter partialWriter = null;
+ boolean responseComplete = false;
+
+ //Retrieve the partial writer used to render the exception
+ if (facesContext == null)
+ {
+ facesContext = FacesContext.getCurrentInstance();
+ }
+
+ facesContext = (facesContext == null) ? FacesContext.getCurrentInstance() : facesContext;
+ ExternalContext externalContext = facesContext.getExternalContext();
+
+ //Clean up the response if by some reason something has been written before.
+ if (!facesContext.getExternalContext().isResponseCommitted())
+ {
+ facesContext.getExternalContext().responseReset();
+ }
+
+ PartialViewContext partialViewContext = facesContext.getPartialViewContext();
+ partialWriter = partialViewContext.getPartialResponseWriter();
+
+ // ajax request --> xml error page
+ externalContext.setResponseContentType("text/xml");
+ externalContext.setResponseCharacterEncoding("UTF-8");
+ externalContext.addResponseHeader("Cache-control", "no-cache");
+
+ try
+ {
+ partialWriter.startDocument();
+
+ for (Throwable t : throwableList)
+ {
+ renderAjaxError(partialWriter, t);
+ }
+
+ responseComplete = true;
+ }
+ catch (IOException e)
+ {
+ if (log.isLoggable(Level.SEVERE))
+ {
+ log.log(Level.SEVERE, "Cannot render exception on ajax request", e);
+ }
+ }
+ finally
+ {
+ if (responseComplete)
+ {
+ try
+ {
+ partialWriter.endDocument();
+ facesContext.responseComplete();
+ }
+ catch (IOException e1)
+ {
+ if (log.isLoggable(Level.SEVERE))
+ {
+ log.log(Level.SEVERE, "Cannot render exception on ajax request", e1);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void renderAjaxError(PartialResponseWriter partialWriter, Throwable ex) throws IOException
+ {
+ partialWriter.startError(ex.getClass().getName());
+ if (ex.getCause() != null)
+ {
+ partialWriter.write(ex.getCause().toString());
+ }
+ else if (ex.getMessage() != null)
+ {
+ partialWriter.write(ex.getMessage());
+ }
+ partialWriter.endError();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isListenerForSource(Object source)
+ {
+ return source instanceof ExceptionQueuedEventContext;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processEvent(SystemEvent exceptionQueuedEvent) throws AbortProcessingException
+ {
+ if (unhandled == null)
+ {
+ unhandled = new LinkedList<ExceptionQueuedEvent>();
+ }
+
+ unhandled.add((ExceptionQueuedEvent)exceptionQueuedEvent);
+ }
+
+ protected Throwable getRethrownException(Throwable exception)
+ {
+ // Let toRethrow be either the result of calling getRootCause() on the Exception,
+ // or the Exception itself, whichever is non-null
+ Throwable toRethrow = getRootCause(exception);
+ if (toRethrow == null)
+ {
+ toRethrow = exception;
+ }
+
+ return toRethrow;
+ }
+
+ protected FacesException wrap(Throwable exception)
+ {
+ if (exception instanceof FacesException)
+ {
+ return (FacesException) exception;
+ }
+ return new FacesException(exception);
+ }
+
+ protected boolean shouldSkip(Throwable exception)
+ {
+ return exception instanceof AbortProcessingException;
+ }
+
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java Sat Oct 22 17:59:32 2011
@@ -1,248 +1,248 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.context;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.el.ELException;
-import javax.faces.FacesException;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.SystemEvent;
-
-/**
- * DOCUMENT ME!
- *
- * @author (latest modification by $Author: slessard $)
- * @version $Revision: 696523 $ $Date: 2008-09-24 18:31:37 -0400 (mer., 17 sept. 2008) $
- *
- * @since 2.0
- */
-public class ExceptionHandlerImpl extends ExceptionHandler
-{
- /*
- * PLEASE NOTE!!!
- * javax.faces.webapp.PreJsf2ExceptionHandlerFactory uses most parts of this implementation
- * for its private static inner class, only the handle method differs a bit.
- * Thus, any changes made here should also be applied to PreJsf2ExceptionHandlerFactory
- * in the right way (you can copy everything except handle(), this method needs special treatment).
- */
-
- private static final Logger log = Logger.getLogger(ExceptionHandlerImpl.class.getName());
-
- private Queue<ExceptionQueuedEvent> handled;
- private Queue<ExceptionQueuedEvent> unhandled;
- private ExceptionQueuedEvent handledAndThrown;
-
- public ExceptionHandlerImpl()
- {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ExceptionQueuedEvent getHandledExceptionQueuedEvent()
- {
- return handledAndThrown;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
- {
- return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Throwable getRootCause(Throwable t)
- {
- if (t == null)
- {
- throw new NullPointerException("t");
- }
-
- while (t != null)
- {
- Class<?> clazz = t.getClass();
- if (!clazz.equals(FacesException.class) && !clazz.equals(ELException.class))
- {
- return t;
- }
-
- t = t.getCause();
- }
-
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
- {
- return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void handle() throws FacesException
- {
- if (unhandled != null && !unhandled.isEmpty())
- {
- if (handled == null)
- {
- handled = new LinkedList<ExceptionQueuedEvent>();
- }
-
- FacesException toThrow = null;
-
- do
- {
- // For each ExceptionEvent in the list
-
- // get the event to handle
- ExceptionQueuedEvent event = unhandled.peek();
- try
- {
- // call its getContext() method
- ExceptionQueuedEventContext context = event.getContext();
-
- // and call getException() on the returned result
- Throwable exception = context.getException();
-
- // Upon encountering the first such Exception that is not an instance of
- // javax.faces.event.AbortProcessingException
- if (!shouldSkip(exception))
- {
- // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
- handledAndThrown = event;
-
- // Re-wrap toThrow in a ServletException or (PortletException, if in a portlet environment)
- // and throw it
- // FIXME: The spec says to NOT use a FacesException to propagate the exception, but I see
- // no other way as ServletException is not a RuntimeException
- toThrow = wrap(getRethrownException(exception));
- break;
- }
- else
- {
- // Testing mojarra it logs a message and the exception
- // however, this behaviour is not mentioned in the spec
- log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
- (context.inBeforePhase() ? "beforePhase() of " :
- (context.inAfterPhase() ? "afterPhase() of " : "")) +
- "phase " + context.getPhaseId() + ": " +
- "UIComponent-ClientId=" +
- (context.getComponent() != null ?
- context.getComponent().getClientId(context.getContext()) : "") + ", " +
- "Message=" + exception.getMessage());
-
- log.log(Level.SEVERE, exception.getMessage(), exception);
-
- }
- }
- catch (Throwable t)
- {
- // A FacesException must be thrown if a problem occurs while performing
- // the algorithm to handle the exception
- throw new FacesException("Could not perform the algorithm to handle the Exception", t);
- }
- finally
- {
- // if we will throw the Exception or if we just logged it,
- // we handled it in either way --> add to handled
- handled.add(event);
- unhandled.remove(event);
- }
- } while (!unhandled.isEmpty());
-
- // do we have to throw an Exception?
- if (toThrow != null)
- {
- throw toThrow;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isListenerForSource(Object source)
- {
- return source instanceof ExceptionQueuedEventContext;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void processEvent(SystemEvent exceptionQueuedEvent) throws AbortProcessingException
- {
- if (unhandled == null)
- {
- unhandled = new LinkedList<ExceptionQueuedEvent>();
- }
-
- unhandled.add((ExceptionQueuedEvent)exceptionQueuedEvent);
- }
-
- protected Throwable getRethrownException(Throwable exception)
- {
- // Let toRethrow be either the result of calling getRootCause() on the Exception,
- // or the Exception itself, whichever is non-null
- Throwable toRethrow = getRootCause(exception);
- if (toRethrow == null)
- {
- toRethrow = exception;
- }
-
- return toRethrow;
- }
-
- protected FacesException wrap(Throwable exception)
- {
- if (exception instanceof FacesException)
- {
- return (FacesException) exception;
- }
- return new FacesException(exception);
- }
-
- protected boolean shouldSkip(Throwable exception)
- {
- return exception instanceof AbortProcessingException;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.context;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.el.ELException;
+import javax.faces.FacesException;
+import javax.faces.context.ExceptionHandler;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ExceptionQueuedEvent;
+import javax.faces.event.ExceptionQueuedEventContext;
+import javax.faces.event.SystemEvent;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ *
+ * @since 2.0
+ */
+public class ExceptionHandlerImpl extends ExceptionHandler
+{
+ /*
+ * PLEASE NOTE!!!
+ * javax.faces.webapp.PreJsf2ExceptionHandlerFactory uses most parts of this implementation
+ * for its private static inner class, only the handle method differs a bit.
+ * Thus, any changes made here should also be applied to PreJsf2ExceptionHandlerFactory
+ * in the right way (you can copy everything except handle(), this method needs special treatment).
+ */
+
+ private static final Logger log = Logger.getLogger(ExceptionHandlerImpl.class.getName());
+
+ private Queue<ExceptionQueuedEvent> handled;
+ private Queue<ExceptionQueuedEvent> unhandled;
+ private ExceptionQueuedEvent handledAndThrown;
+
+ public ExceptionHandlerImpl()
+ {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ExceptionQueuedEvent getHandledExceptionQueuedEvent()
+ {
+ return handledAndThrown;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
+ {
+ return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Throwable getRootCause(Throwable t)
+ {
+ if (t == null)
+ {
+ throw new NullPointerException("t");
+ }
+
+ while (t != null)
+ {
+ Class<?> clazz = t.getClass();
+ if (!clazz.equals(FacesException.class) && !clazz.equals(ELException.class))
+ {
+ return t;
+ }
+
+ t = t.getCause();
+ }
+
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
+ {
+ return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void handle() throws FacesException
+ {
+ if (unhandled != null && !unhandled.isEmpty())
+ {
+ if (handled == null)
+ {
+ handled = new LinkedList<ExceptionQueuedEvent>();
+ }
+
+ FacesException toThrow = null;
+
+ do
+ {
+ // For each ExceptionEvent in the list
+
+ // get the event to handle
+ ExceptionQueuedEvent event = unhandled.peek();
+ try
+ {
+ // call its getContext() method
+ ExceptionQueuedEventContext context = event.getContext();
+
+ // and call getException() on the returned result
+ Throwable exception = context.getException();
+
+ // Upon encountering the first such Exception that is not an instance of
+ // javax.faces.event.AbortProcessingException
+ if (!shouldSkip(exception))
+ {
+ // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
+ handledAndThrown = event;
+
+ // Re-wrap toThrow in a ServletException or (PortletException, if in a portlet environment)
+ // and throw it
+ // FIXME: The spec says to NOT use a FacesException to propagate the exception, but I see
+ // no other way as ServletException is not a RuntimeException
+ toThrow = wrap(getRethrownException(exception));
+ break;
+ }
+ else
+ {
+ // Testing mojarra it logs a message and the exception
+ // however, this behaviour is not mentioned in the spec
+ log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
+ (context.inBeforePhase() ? "beforePhase() of " :
+ (context.inAfterPhase() ? "afterPhase() of " : "")) +
+ "phase " + context.getPhaseId() + ": " +
+ "UIComponent-ClientId=" +
+ (context.getComponent() != null ?
+ context.getComponent().getClientId(context.getContext()) : "") + ", " +
+ "Message=" + exception.getMessage());
+
+ log.log(Level.SEVERE, exception.getMessage(), exception);
+
+ }
+ }
+ catch (Throwable t)
+ {
+ // A FacesException must be thrown if a problem occurs while performing
+ // the algorithm to handle the exception
+ throw new FacesException("Could not perform the algorithm to handle the Exception", t);
+ }
+ finally
+ {
+ // if we will throw the Exception or if we just logged it,
+ // we handled it in either way --> add to handled
+ handled.add(event);
+ unhandled.remove(event);
+ }
+ } while (!unhandled.isEmpty());
+
+ // do we have to throw an Exception?
+ if (toThrow != null)
+ {
+ throw toThrow;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isListenerForSource(Object source)
+ {
+ return source instanceof ExceptionQueuedEventContext;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processEvent(SystemEvent exceptionQueuedEvent) throws AbortProcessingException
+ {
+ if (unhandled == null)
+ {
+ unhandled = new LinkedList<ExceptionQueuedEvent>();
+ }
+
+ unhandled.add((ExceptionQueuedEvent)exceptionQueuedEvent);
+ }
+
+ protected Throwable getRethrownException(Throwable exception)
+ {
+ // Let toRethrow be either the result of calling getRootCause() on the Exception,
+ // or the Exception itself, whichever is non-null
+ Throwable toRethrow = getRootCause(exception);
+ if (toRethrow == null)
+ {
+ toRethrow = exception;
+ }
+
+ return toRethrow;
+ }
+
+ protected FacesException wrap(Throwable exception)
+ {
+ if (exception instanceof FacesException)
+ {
+ return (FacesException) exception;
+ }
+ return new FacesException(exception);
+ }
+
+ protected boolean shouldSkip(Throwable exception)
+ {
+ return exception instanceof AbortProcessingException;
+ }
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/ResponseWriterWrapper.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Oct 22 17:59:32 2011
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java Sat Oct 22 17:59:32 2011
@@ -1,115 +1,115 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.context;
-
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerWrapper;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.SystemEvent;
-
-/**
- * This wrapper is a switch to choose in a lazy way between ajax and
- * normal exceptionHandler wrapping, because FacesContext is initialized after
- * ExceptionHandler, so it is not safe to get it when
- * ExceptionHandlerFactory.getExceptionHandler() is called.
- *
- * @author Leonardo Uribe
- *
- */
-public class SwitchAjaxExceptionHandlerWrapperImpl extends ExceptionHandlerWrapper
-{
- private ExceptionHandler _requestExceptionHandler;
- private ExceptionHandler _ajaxExceptionHandler;
- private Boolean _isAjaxRequest;
-
- public SwitchAjaxExceptionHandlerWrapperImpl(
- ExceptionHandler requestExceptionHandler,
- ExceptionHandler ajaxExceptionHandler)
- {
- _requestExceptionHandler = requestExceptionHandler;
- _ajaxExceptionHandler = ajaxExceptionHandler;
- }
-
- @Override
- public void processEvent(SystemEvent exceptionQueuedEvent)
- throws AbortProcessingException
- {
- //Check if this is an ajax request, but take advantage of exceptionQueuedEvent facesContext
- isAjaxRequest(exceptionQueuedEvent);
- super.processEvent(exceptionQueuedEvent);
- }
-
- protected boolean isAjaxRequest(SystemEvent exceptionQueuedEvent)
- {
- if (_isAjaxRequest == null)
- {
- if (exceptionQueuedEvent instanceof ExceptionQueuedEvent)
- {
- ExceptionQueuedEvent eqe = (ExceptionQueuedEvent)exceptionQueuedEvent;
- ExceptionQueuedEventContext eqec = eqe.getContext();
- if (eqec != null)
- {
- FacesContext facesContext = eqec.getContext();
- if (facesContext != null)
- {
- return isAjaxRequest(facesContext);
- }
- }
- }
- return isAjaxRequest();
- }
- return _isAjaxRequest;
- }
-
- protected boolean isAjaxRequest(FacesContext facesContext)
- {
- if (_isAjaxRequest == null)
- {
- facesContext = (facesContext == null) ? FacesContext.getCurrentInstance() : facesContext;
- _isAjaxRequest = facesContext.getPartialViewContext().isAjaxRequest();
- }
- return _isAjaxRequest;
- }
-
- protected boolean isAjaxRequest()
- {
- if (_isAjaxRequest == null)
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- _isAjaxRequest = facesContext.getPartialViewContext().isAjaxRequest();
- }
- return _isAjaxRequest;
- }
-
- @Override
- public ExceptionHandler getWrapped()
- {
- if (isAjaxRequest())
- {
- return _ajaxExceptionHandler;
- }
- else
- {
- return _requestExceptionHandler;
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.context;
+
+import javax.faces.context.ExceptionHandler;
+import javax.faces.context.ExceptionHandlerWrapper;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ExceptionQueuedEvent;
+import javax.faces.event.ExceptionQueuedEventContext;
+import javax.faces.event.SystemEvent;
+
+/**
+ * This wrapper is a switch to choose in a lazy way between ajax and
+ * normal exceptionHandler wrapping, because FacesContext is initialized after
+ * ExceptionHandler, so it is not safe to get it when
+ * ExceptionHandlerFactory.getExceptionHandler() is called.
+ *
+ * @author Leonardo Uribe
+ *
+ */
+public class SwitchAjaxExceptionHandlerWrapperImpl extends ExceptionHandlerWrapper
+{
+ private ExceptionHandler _requestExceptionHandler;
+ private ExceptionHandler _ajaxExceptionHandler;
+ private Boolean _isAjaxRequest;
+
+ public SwitchAjaxExceptionHandlerWrapperImpl(
+ ExceptionHandler requestExceptionHandler,
+ ExceptionHandler ajaxExceptionHandler)
+ {
+ _requestExceptionHandler = requestExceptionHandler;
+ _ajaxExceptionHandler = ajaxExceptionHandler;
+ }
+
+ @Override
+ public void processEvent(SystemEvent exceptionQueuedEvent)
+ throws AbortProcessingException
+ {
+ //Check if this is an ajax request, but take advantage of exceptionQueuedEvent facesContext
+ isAjaxRequest(exceptionQueuedEvent);
+ super.processEvent(exceptionQueuedEvent);
+ }
+
+ protected boolean isAjaxRequest(SystemEvent exceptionQueuedEvent)
+ {
+ if (_isAjaxRequest == null)
+ {
+ if (exceptionQueuedEvent instanceof ExceptionQueuedEvent)
+ {
+ ExceptionQueuedEvent eqe = (ExceptionQueuedEvent)exceptionQueuedEvent;
+ ExceptionQueuedEventContext eqec = eqe.getContext();
+ if (eqec != null)
+ {
+ FacesContext facesContext = eqec.getContext();
+ if (facesContext != null)
+ {
+ return isAjaxRequest(facesContext);
+ }
+ }
+ }
+ return isAjaxRequest();
+ }
+ return _isAjaxRequest;
+ }
+
+ protected boolean isAjaxRequest(FacesContext facesContext)
+ {
+ if (_isAjaxRequest == null)
+ {
+ facesContext = (facesContext == null) ? FacesContext.getCurrentInstance() : facesContext;
+ _isAjaxRequest = facesContext.getPartialViewContext().isAjaxRequest();
+ }
+ return _isAjaxRequest;
+ }
+
+ protected boolean isAjaxRequest()
+ {
+ if (_isAjaxRequest == null)
+ {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ _isAjaxRequest = facesContext.getPartialViewContext().isAjaxRequest();
+ }
+ return _isAjaxRequest;
+ }
+
+ @Override
+ public ExceptionHandler getWrapped()
+ {
+ if (isAjaxRequest())
+ {
+ return _ajaxExceptionHandler;
+ }
+ else
+ {
+ return _requestExceptionHandler;
+ }
+ }
+}
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/SwitchAjaxExceptionHandlerWrapperImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java Sat Oct 22 17:59:32 2011
@@ -44,9 +44,9 @@ import java.util.logging.Logger;
/**
* Implementation of Flash object
*
- * @author Leonardo Uribe (latest modification by $Author: lu4242 $)
+ * @author Leonardo Uribe (latest modification by $Author$)
* @author Jakob Korherr
- * @version $Revision: 904316 $ $Date: 2010-01-28 17:14:41 -0700 (Thu, 28 Jan 2010) $
+ * @version $Revision$ $Date$
*/
public class FlashImpl extends Flash
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java?rev=1187741&r1=1187740&r2=1187741&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java Sat Oct 22 17:59:32 2011
@@ -21,8 +21,8 @@ package org.apache.myfaces.shared.contex
import javax.faces.FacesException;
/**
- * @author Ganesh Jung (latest modification by $Author: $)
- * @version $Revision: $ $Date: $
+ * @author Ganesh Jung (latest modification by $Author$)
+ * @version $Revision$ $Date$
*/
public class FlashScopeDisabledException extends FacesException
{
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/FlashScopeDisabledException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/el/SimpleActionMethodBinding.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Oct 22 17:59:32 2011
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL
Propchange: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/readme.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Oct 22 17:59:32 2011
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL