You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/29 11:28:47 UTC

svn commit: r1194849 [1/3] - in /myfaces/core/trunk: impl/src/main/java/org/apache/myfaces/renderkit/ impl/src/main/java/org/apache/myfaces/renderkit/html/ impl/src/main/java/org/apache/myfaces/resource/ impl/src/main/java/org/apache/myfaces/shared_imp...

Author: struberg
Date: Sat Oct 29 09:28:45 2011
New Revision: 1194849

URL: http://svn.apache.org/viewvc?rev=1194849&view=rev
Log:
MYFACES-3368 fix lines > 120 chars

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FaceletConfigResourceProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigResourceProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.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/compiler/TagLibraryConfig.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
    myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java Sat Oct 29 09:28:45 2011
@@ -568,7 +568,8 @@ class ServerSideStateCacheImpl extends S
     {
         private static final long serialVersionUID = -3734849062185115847L;
 
-        private final List<SerializedViewKey> _keys = new ArrayList<SerializedViewKey>(DEFAULT_NUMBER_OF_VIEWS_IN_SESSION);
+        private final List<SerializedViewKey> _keys
+                = new ArrayList<SerializedViewKey>(DEFAULT_NUMBER_OF_VIEWS_IN_SESSION);
         private final Map<SerializedViewKey, Object> _serializedViews = new HashMap<SerializedViewKey, Object>();
         
         private final Map<SerializedViewKey, SerializedViewKey> _precedence = 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Sat Oct 29 09:28:45 2011
@@ -64,7 +64,8 @@ public class HtmlResponseStateManager ex
      * </p> 
      */
     @JSFWebConfigParam(since="2.0.6", expectedValues="true, false", defaultValue="true", group="state")
-    public static final String INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS = "org.apache.myfaces.HANDLE_STATE_CACHING_MECHANICS";
+    public static final String INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS
+            = "org.apache.myfaces.HANDLE_STATE_CACHING_MECHANICS";
     
     private Boolean _handleStateCachingMechanics;
     
@@ -79,8 +80,9 @@ public class HtmlResponseStateManager ex
     {
         if (_handleStateCachingMechanics == null)
         {
-            _handleStateCachingMechanics = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
-                    INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS, true);
+            _handleStateCachingMechanics
+                    = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
+                        INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS, true);
         }
         return _handleStateCachingMechanics.booleanValue();
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java Sat Oct 29 09:28:45 2011
@@ -77,7 +77,8 @@ public class HtmlScriptRenderer extends 
                 Location location = (Location) component.getAttributes().get(CompositeComponentELUtils.LOCATION_KEY);
                 if (location != null)
                 {
-                    UIComponent ccParent = CompositeComponentELUtils.getCompositeComponentBasedOnLocation(facesContext, location);
+                    UIComponent ccParent
+                            = CompositeComponentELUtils.getCompositeComponentBasedOnLocation(facesContext, location);
                     if (ccParent != null)
                     {
                         component.getAttributes().put(

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java Sat Oct 29 09:28:45 2011
@@ -77,7 +77,8 @@ public class HtmlStylesheetRenderer exte
             Location location = (Location) component.getAttributes().get(CompositeComponentELUtils.LOCATION_KEY);
             if (location != null)
             {
-                UIComponent ccParent = CompositeComponentELUtils.getCompositeComponentBasedOnLocation(facesContext, location); 
+                UIComponent ccParent
+                        = CompositeComponentELUtils.getCompositeComponentBasedOnLocation(facesContext, location);
                 if (ccParent != null)
                 {
                     component.getAttributes().put(
@@ -227,7 +228,8 @@ public class HtmlStylesheetRenderer exte
             writer.writeAttribute(HTML.TYPE_ATTR, 
                     (resource.getContentType() == null ? HTML.STYLE_TYPE_TEXT_CSS
                             : resource.getContentType()) , null);
-            writer.writeURIAttribute(HTML.HREF_ATTR, facesContext.getExternalContext().encodeResourceURL(resource.getRequestPath()), null);
+            writer.writeURIAttribute(HTML.HREF_ATTR,
+                    facesContext.getExternalContext().encodeResourceURL(resource.getRequestPath()), null);
             writer.endElement(HTML.LINK_ELEM);
         }
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java Sat Oct 29 09:28:45 2011
@@ -46,7 +46,8 @@ public class InternalClassLoaderResource
      * debugging of the default jsf javascript file more simple.
      */
     @JSFWebConfigParam(since = "2.0.1", defaultValue = "false", expectedValues = "true,false", group = "render")
-    public static final String USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS = "org.apache.myfaces.USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS";
+    public static final String USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS
+            = "org.apache.myfaces.USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS";
 
     /**
      * Define the mode used for jsf.js file:
@@ -58,8 +59,8 @@ public class InternalClassLoaderResource
      * <p>If org.apache.myfaces.USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS param is set to true and project stage
      * is Development, this param is ignored.</p>
      */
-    @JSFWebConfigParam(since = "2.0.10,2.1.4", defaultValue = "normal", expectedValues = "normal, minimal-modern, minimal",
-            group = "render")
+    @JSFWebConfigParam(since = "2.0.10,2.1.4", defaultValue = "normal",
+                       expectedValues = "normal, minimal-modern, minimal", group = "render")
     public static final String MYFACES_JSF_MODE = "org.apache.myfaces.JSF_JS_MODE";
     
     private final boolean _useMultipleJsFilesForJsfUncompressedJs;
@@ -69,11 +70,12 @@ public class InternalClassLoaderResource
     public InternalClassLoaderResourceLoader(String prefix)
     {
         super(prefix);
-        _useMultipleJsFilesForJsfUncompressedJs = WebConfigParamUtils.getBooleanInitParameter(FacesContext.getCurrentInstance().getExternalContext(),
-                USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS, false);
+        _useMultipleJsFilesForJsfUncompressedJs
+                = WebConfigParamUtils.getBooleanInitParameter(FacesContext.getCurrentInstance().getExternalContext(),
+                    USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS, false);
 
-        _jsfMode = WebConfigParamUtils.getStringInitParameter(FacesContext.getCurrentInstance().getExternalContext(), MYFACES_JSF_MODE, 
-                ResourceUtils.JSF_MYFACES_JSFJS_NORMAL);
+        _jsfMode = WebConfigParamUtils.getStringInitParameter(FacesContext.getCurrentInstance().getExternalContext(),
+                    MYFACES_JSF_MODE, ResourceUtils.JSF_MYFACES_JSFJS_NORMAL);
         _developmentStage = FacesContext.getCurrentInstance().isProjectStage(ProjectStage.Development);
     }
 
@@ -161,9 +163,11 @@ public class InternalClassLoaderResource
                 else
                 {
                     //normall we would have to take care about the standard jsf.js case also
-                    //but our standard resource loader takes care of it, because this part is only called in debugging mode
+                    //but our standard resource loader takes care of it,
+                    // because this part is only called in debugging mode
                     //in production only in debugging
-                    return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion, "jsf-uncompressed-full.js", false);
+                    return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion,
+                                                     "jsf-uncompressed-full.js", false);
                 }
             }
             else if (_jsfMode.equals(ResourceUtils.JSF_MYFACES_JSFJS_MINIMAL) )

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java Sat Oct 29 09:28:45 2011
@@ -144,9 +144,7 @@ public class WebXml
                     for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
                     {
                         String urlpattern = (String)it2.next();
-                        tempFacesServletMappings.add(new org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping(servletName,
-                                                                                                             servletClass,
-                                                                                                             urlpattern));
+                        tempFacesServletMappings.add(new ServletMapping(servletName, servletClass, urlpattern));
                         if (log.isLoggable(Level.FINEST))
                         {
                             log.finest("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java Sat Oct 29 09:28:45 2011
@@ -258,7 +258,8 @@ public class WebXmlParser
                 {
                     servletClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
                 }
-                else if (n.getNodeName().equals("description") || n.getNodeName().equals("load-on-startup") || n.getNodeName().equals("init-param"))
+                else if (n.getNodeName().equals("description") || n.getNodeName().equals("load-on-startup")
+                         || n.getNodeName().equals("init-param"))
                 {
                     //ignore
                 }
@@ -266,7 +267,8 @@ public class WebXmlParser
                 {
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '"
+                                 + servletElem.getNodeName() + "'.");
                     }
                 }
             }
@@ -304,7 +306,8 @@ public class WebXmlParser
                 {
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '"
+                                 + servletMappingElem.getNodeName() + "'.");
                     }
                 }
             }
@@ -346,7 +349,8 @@ public class WebXmlParser
                 {
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '"
+                                 + filterElem.getNodeName() + "'.");
                     }
                 }
             }
@@ -388,7 +392,8 @@ public class WebXmlParser
                 {
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+                        log.fine("Ignored element '" + n.getNodeName() + "' as child of '"
+                                 + filterMappingElem.getNodeName() + "'.");
                     }
                 }
             }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java Sat Oct 29 09:28:45 2011
@@ -84,7 +84,8 @@ public abstract class AnnotationProvider
     public abstract Map<Class<? extends Annotation>,Set<Class<?>>> getAnnotatedClasses(ExternalContext ctx);
 
     /**
-     * <p>The returned Set&lt;URL&gt; urls are calculated in this way ( see JSF 2.0 spec section 11.4.2 for definitions )    
+     * <p>The returned Set&lt;URL&gt; urls are calculated in this way
+     * ( see JSF 2.0 spec section 11.4.2 for definitions )
      * </p>
      * <ol>
      * <li>All resources that match either "META-INF/faces-config.xml" or end with ".facesconfig.xml" directly in 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/AnnotationProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.spi;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 
 import javax.faces.FacesException;
 import javax.faces.context.ExternalContext;
@@ -53,7 +54,7 @@ public abstract class AnnotationProvider
             if (System.getSecurityManager() != null)
             {
                 final ExternalContext ectx = ctx;
-                lpf = (AnnotationProviderFactory) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<Object>()
+                lpf = (AnnotationProviderFactory) AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
                         {
                             public Object run() throws PrivilegedActionException
                             {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FaceletConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FaceletConfigResourceProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FaceletConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FaceletConfigResourceProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.spi;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 
 import javax.faces.FacesException;
 import javax.faces.context.ExternalContext;
@@ -41,7 +42,8 @@ public abstract class FaceletConfigResou
 
     public static FaceletConfigResourceProviderFactory getFacesConfigResourceProviderFactory(ExternalContext ctx)
     {
-        FaceletConfigResourceProviderFactory instance = (FaceletConfigResourceProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
+        FaceletConfigResourceProviderFactory instance
+                = (FaceletConfigResourceProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
         if (instance != null)
         {
             return instance;
@@ -53,7 +55,8 @@ public abstract class FaceletConfigResou
             if (System.getSecurityManager() != null)
             {
                 final ExternalContext ectx = ctx;
-                lpf = (FaceletConfigResourceProviderFactory) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<Object>()
+                lpf = (FaceletConfigResourceProviderFactory)
+                        AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
                         {
                             public Object run() throws PrivilegedActionException
                             {
@@ -65,7 +68,8 @@ public abstract class FaceletConfigResou
             }
             else
             {
-                lpf = (FaceletConfigResourceProviderFactory) SpiUtils.build(ctx, FaceletConfigResourceProviderFactory.class, FACTORY_DEFAULT);
+                lpf = (FaceletConfigResourceProviderFactory)
+                        SpiUtils.build(ctx, FaceletConfigResourceProviderFactory.class, FACTORY_DEFAULT);
             }
         }
         catch (PrivilegedActionException pae)
@@ -79,7 +83,8 @@ public abstract class FaceletConfigResou
         return lpf;
     }
 
-    public static void setFaceletConfigResourceProviderFactory(ExternalContext ctx, FaceletConfigResourceProviderFactory instance)
+    public static void setFaceletConfigResourceProviderFactory(ExternalContext ctx,
+                                                               FaceletConfigResourceProviderFactory instance)
     {
         ctx.getApplicationMap().put(FACTORY_KEY, instance);
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigResourceProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigResourceProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.spi;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 
 import javax.faces.FacesException;
 import javax.faces.context.ExternalContext;
@@ -41,7 +42,8 @@ public abstract class FacesConfigResourc
 
     public static FacesConfigResourceProviderFactory getFacesConfigResourceProviderFactory(ExternalContext ctx)
     {
-        FacesConfigResourceProviderFactory instance = (FacesConfigResourceProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
+        FacesConfigResourceProviderFactory instance
+                = (FacesConfigResourceProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
         if (instance != null)
         {
             return instance;
@@ -53,7 +55,8 @@ public abstract class FacesConfigResourc
             if (System.getSecurityManager() != null)
             {
                 final ExternalContext ectx = ctx;
-                lpf = (FacesConfigResourceProviderFactory) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<Object>()
+                lpf = (FacesConfigResourceProviderFactory)
+                        AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
                         {
                             public Object run() throws PrivilegedActionException
                             {
@@ -65,7 +68,8 @@ public abstract class FacesConfigResourc
             }
             else
             {
-                lpf = (FacesConfigResourceProviderFactory) SpiUtils.build(ctx, FacesConfigResourceProviderFactory.class, FACTORY_DEFAULT);
+                lpf = (FacesConfigResourceProviderFactory)
+                        SpiUtils.build(ctx, FacesConfigResourceProviderFactory.class, FACTORY_DEFAULT);
             }
         }
         catch (PrivilegedActionException pae)
@@ -79,7 +83,8 @@ public abstract class FacesConfigResourc
         return lpf;
     }
 
-    public static void setFacesConfigResourceProviderFactory(ExternalContext ctx, FacesConfigResourceProviderFactory instance)
+    public static void setFacesConfigResourceProviderFactory(ExternalContext ctx,
+                                                             FacesConfigResourceProviderFactory instance)
     {
         ctx.getApplicationMap().put(FACTORY_KEY, instance);
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java Sat Oct 29 09:28:45 2011
@@ -69,7 +69,8 @@ public abstract class FacesConfiguration
     public abstract FacesConfig getAnnotationsFacesConfig(ExternalContext ectx, boolean metadataComplete);
     
     /**
-     * Return the FacesConfig object model retrieved from resources under the path META-INF/faces-config.xml and META-INF/[prefix].faces-config.xml
+     * Return the FacesConfig object model retrieved from resources under the path
+     * META-INF/faces-config.xml and META-INF/[prefix].faces-config.xml
      * 
      * @param ectx
      * @return

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -43,7 +43,8 @@ public abstract class FacesConfiguration
 
     public static FacesConfigurationProviderFactory getFacesConfigurationProviderFactory(ExternalContext ctx)
     {
-        FacesConfigurationProviderFactory factory = (FacesConfigurationProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
+        FacesConfigurationProviderFactory factory
+                = (FacesConfigurationProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
         if (factory != null)
         {
             // use cached instance
@@ -71,8 +72,8 @@ public abstract class FacesConfiguration
             }
             else
             {
-                //factory = (FacesConfigurationProviderFactory) DiscoverSingleton.find(FacesConfigurationProviderFactory.class, FACTORY_DEFAULT);
-                factory = (FacesConfigurationProviderFactory) SpiUtils.build(ctx, FacesConfigurationProviderFactory.class, FACTORY_DEFAULT);
+                factory = (FacesConfigurationProviderFactory)
+                        SpiUtils.build(ctx, FacesConfigurationProviderFactory.class, FACTORY_DEFAULT);
             }
         }
         catch (PrivilegedActionException pae)
@@ -89,11 +90,12 @@ public abstract class FacesConfiguration
         return factory;
     }
 
-    public static void setFacesConfigurationProviderFactory(ExternalContext ctx, FacesConfigurationProviderFactory factory)
+    public static void setFacesConfigurationProviderFactory(ExternalContext ctx,
+                                                            FacesConfigurationProviderFactory factory)
     {
         ctx.getApplicationMap().put(FACTORY_KEY, factory);
     }
 
     public abstract FacesConfigurationProvider getFacesConfigurationProvider(ExternalContext externalContext);
 
-}
\ No newline at end of file
+}

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java Sat Oct 29 09:28:45 2011
@@ -38,8 +38,10 @@ public abstract class WebConfigProvider
      * </p>
      * <ol>
      *   <li>Mappings related to registered servlet class javax.faces.webapp.FacesServlet.</li>
-     *   <li>Mappings related to registered servlet class implementing org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet interface.</li>
-     *   <li>Mappings related to registered servlet class registered using org.apache.myfaces.DELEGATE_FACES_SERVLET web config param.</li>
+     *   <li>Mappings related to registered servlet class implementing
+     *   org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet interface.</li>
+     *   <li>Mappings related to registered servlet class registered
+     *   using org.apache.myfaces.DELEGATE_FACES_SERVLET web config param.</li>
      * </ol>
      * 
      * @param externalContext

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -72,8 +72,8 @@ public abstract class WebConfigProviderF
             }
             else
             {
-                //factory = (WebConfigProviderFactory) DiscoverSingleton.find(WebConfigProviderFactory.class, FACTORY_DEFAULT);
-                factory = (WebConfigProviderFactory) SpiUtils.build(ctx, WebConfigProviderFactory.class, FACTORY_DEFAULT);
+                factory = (WebConfigProviderFactory)
+                        SpiUtils.build(ctx, WebConfigProviderFactory.class, FACTORY_DEFAULT);
             }
         }
         catch (PrivilegedActionException pae)
@@ -97,4 +97,4 @@ public abstract class WebConfigProviderF
 
     public abstract WebConfigProvider getWebConfigProvider(ExternalContext externalContext);
 
-}
\ No newline at end of file
+}

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -29,6 +29,7 @@ import javax.faces.context.ExternalConte
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -54,7 +55,8 @@ public class DefaultAnnotationProviderFa
     @Override
     public AnnotationProvider getAnnotationProvider(ExternalContext externalContext)
     {
-        AnnotationProvider annotationProvider = (AnnotationProvider) externalContext.getApplicationMap().get(ANNOTATION_PROVIDER_INSTANCE);
+        AnnotationProvider annotationProvider
+                = (AnnotationProvider) externalContext.getApplicationMap().get(ANNOTATION_PROVIDER_INSTANCE);
         if (annotationProvider == null)
         {
             annotationProvider = createAnnotationProvider(externalContext);
@@ -73,7 +75,7 @@ public class DefaultAnnotationProviderFa
         {
             if (System.getSecurityManager() != null)
             {
-                returnValue = AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<AnnotationProvider>()
+                returnValue = AccessController.doPrivileged(new PrivilegedExceptionAction<AnnotationProvider>()
                         {
                             public AnnotationProvider run() throws ClassNotFoundException,
                                     NoClassDefFoundError,
@@ -129,7 +131,8 @@ public class DefaultAnnotationProviderFa
         List<String> classList = (List<String>) externalContext.getApplicationMap().get(ANNOTATION_PROVIDER_LIST);
         if (classList == null)
         {
-            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(ANNOTATION_PROVIDER);
+            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).
+                    getServiceProviderList(ANNOTATION_PROVIDER);
             externalContext.getApplicationMap().put(ANNOTATION_PROVIDER_LIST, classList);
         }
         return ClassUtils.buildApplicationObject(AnnotationProvider.class, classList, new DefaultAnnotationProvider());

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -29,6 +29,7 @@ import javax.faces.context.ExternalConte
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -59,7 +60,8 @@ public class DefaultFaceletConfigResourc
         {
             if (System.getSecurityManager() != null)
             {
-                returnValue = AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<FaceletConfigResourceProvider>()
+                returnValue
+                        = AccessController.doPrivileged(new PrivilegedExceptionAction<FaceletConfigResourceProvider>()
                         {
                             public FaceletConfigResourceProvider run() throws ClassNotFoundException,
                                     NoClassDefFoundError,
@@ -115,11 +117,13 @@ public class DefaultFaceletConfigResourc
         List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACELET_CONFIG_PROVIDER_LIST);
         if (classList == null)
         {
-            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(FACELET_CONFIG_PROVIDER);
+            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).
+                    getServiceProviderList(FACELET_CONFIG_PROVIDER);
             externalContext.getApplicationMap().put(FACELET_CONFIG_PROVIDER_LIST, classList);
         }
         
-        return ClassUtils.buildApplicationObject(FaceletConfigResourceProvider.class, classList, new DefaultFaceletConfigResourceProvider());        
+        return ClassUtils.buildApplicationObject(FaceletConfigResourceProvider.class, classList,
+                                                 new DefaultFaceletConfigResourceProvider());
     }
 
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -29,6 +29,7 @@ import javax.faces.context.ExternalConte
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -59,7 +60,7 @@ public class DefaultFacesConfigResourceP
         {
             if (System.getSecurityManager() != null)
             {
-                returnValue = AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<FacesConfigResourceProvider>()
+                returnValue = AccessController.doPrivileged(new PrivilegedExceptionAction<FacesConfigResourceProvider>()
                         {
                             public FacesConfigResourceProvider run() throws ClassNotFoundException,
                                     NoClassDefFoundError,
@@ -115,11 +116,13 @@ public class DefaultFacesConfigResourceP
         List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACES_CONFIG_PROVIDER_LIST);
         if (classList == null)
         {
-            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(FACES_CONFIG_PROVIDER);
+            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).
+                    getServiceProviderList(FACES_CONFIG_PROVIDER);
             externalContext.getApplicationMap().put(FACES_CONFIG_PROVIDER_LIST, classList);
         }
 
-        return ClassUtils.buildApplicationObject(FacesConfigResourceProvider.class, classList, new DefaultFacesConfigResourceProvider());
+        return ClassUtils.buildApplicationObject(FacesConfigResourceProvider.class, classList,
+                                                 new DefaultFacesConfigResourceProvider());
     }
 
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -29,6 +29,7 @@ import javax.faces.context.ExternalConte
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -45,7 +46,8 @@ public class DefaultFacesConfigurationPr
     
     public static final String FACES_CONFIGURATION_PROVIDER_LIST = FacesConfigurationProvider.class.getName()+".LIST";
     
-    public static final String FACES_CONFIGURATION_PROVIDER_INSTANCE_KEY = FacesConfigurationProvider.class.getName() + ".INSTANCE";
+    public static final String FACES_CONFIGURATION_PROVIDER_INSTANCE_KEY
+            = FacesConfigurationProvider.class.getName() + ".INSTANCE";
 
     private Logger getLogger()
     {
@@ -65,7 +67,8 @@ public class DefaultFacesConfigurationPr
             {
                 if (System.getSecurityManager() != null)
                 {
-                    returnValue = AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<FacesConfigurationProvider>()
+                    returnValue
+                            = AccessController.doPrivileged(new PrivilegedExceptionAction<FacesConfigurationProvider>()
                             {
                                 public FacesConfigurationProvider run() throws ClassNotFoundException,
                                         NoClassDefFoundError,
@@ -122,13 +125,16 @@ public class DefaultFacesConfigurationPr
             InvocationTargetException,
             PrivilegedActionException
     {
-        List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACES_CONFIGURATION_PROVIDER_LIST);
+        List<String> classList = (List<String>)
+                externalContext.getApplicationMap().get(FACES_CONFIGURATION_PROVIDER_LIST);
         if (classList == null)
         {
-            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(FACES_CONFIGURATION_PROVIDER);
+            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).
+                    getServiceProviderList(FACES_CONFIGURATION_PROVIDER);
             externalContext.getApplicationMap().put(FACES_CONFIGURATION_PROVIDER_LIST, classList);
         }
 
-        return ClassUtils.buildApplicationObject(FacesConfigurationProvider.class, classList, new DefaultFacesConfigurationProvider());
+        return ClassUtils.buildApplicationObject(FacesConfigurationProvider.class, classList,
+                                                 new DefaultFacesConfigurationProvider());
     }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java Sat Oct 29 09:28:45 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.spi.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -63,7 +64,7 @@ public class DefaultWebConfigProviderFac
         {
             if (System.getSecurityManager() != null)
             {
-                returnValue = AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<WebConfigProvider>()
+                returnValue = AccessController.doPrivileged(new PrivilegedExceptionAction<WebConfigProvider>()
                         {
                             public WebConfigProvider run() throws ClassNotFoundException,
                                     NoClassDefFoundError,
@@ -120,11 +121,12 @@ public class DefaultWebConfigProviderFac
         List<String> classList = (List<String>) externalContext.getApplicationMap().get(WEB_CONFIG_PROVIDER_LIST);
         if (classList == null)
         {
-            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(WEB_CONFIG_PROVIDER);
+            classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).
+                    getServiceProviderList(WEB_CONFIG_PROVIDER);
             externalContext.getApplicationMap().put(WEB_CONFIG_PROVIDER_LIST, classList);
         }
 
         return ClassUtils.buildApplicationObject(WebConfigProvider.class, classList, new DefaultWebConfigProvider());
     }
 
-}
\ No newline at end of file
+}

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java Sat Oct 29 09:28:45 2011
@@ -38,7 +38,8 @@ public final class SpiUtils
     
     public static Object build(ExternalContext ectx, Class spiClass, String defaultImpl)
     {
-        List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(ectx).getServiceProviderList(spiClass.getName());
+        List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(ectx).
+                getServiceProviderList(spiClass.getName());
         
         if (classList != null && !classList.isEmpty())
         {
@@ -56,4 +57,4 @@ public final class SpiUtils
     {
         return Logger.getLogger(SpiUtils.class.getName());
     }
-}
\ No newline at end of file
+}

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java Sat Oct 29 09:28:45 2011
@@ -59,8 +59,8 @@ public abstract class AbstractFacelet ex
      * @throws FaceletException
      * @throws ELException
      */
-    public abstract void include(AbstractFaceletContext ctx, UIComponent parent, String path) throws IOException, FacesException,
-            FaceletException, ELException;
+    public abstract void include(AbstractFaceletContext ctx, UIComponent parent, String path)
+            throws IOException, FacesException, FaceletException, ELException;
     
     /**
      * Grabs a DefaultFacelet from referenced DefaultFaceletFacotry
@@ -77,8 +77,8 @@ public abstract class AbstractFacelet ex
      * @throws FaceletException
      * @throws ELException
      */
-    public abstract void include(AbstractFaceletContext ctx, UIComponent parent, URL url) throws IOException, FacesException,
-            FaceletException, ELException;
+    public abstract void include(AbstractFaceletContext ctx, UIComponent parent, URL url)
+            throws IOException, FacesException, FaceletException, ELException;
     
     /**
      * Return the alias name for error messages and logging
@@ -87,8 +87,8 @@ public abstract class AbstractFacelet ex
      */
     public abstract String getAlias();
     
-    public abstract void applyCompositeComponent(AbstractFaceletContext ctx, UIComponent parent, Resource resource) throws IOException, FacesException,
-            FaceletException, ELException;
+    public abstract void applyCompositeComponent(AbstractFaceletContext ctx, UIComponent parent, Resource resource)
+            throws IOException, FacesException, FaceletException, ELException;
     
     public abstract boolean isBuildingCompositeComponentMetadata();
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java Sat Oct 29 09:28:45 2011
@@ -377,7 +377,8 @@ class DefaultFaceletsStateManagementHelp
         {
             if (log.isLoggable(Level.FINEST))
             {
-                log.finest("Processing deserializeView - deserializing serialized state. Bytes : " + ((byte[]) state).length);
+                log.finest("Processing deserializeView - deserializing serialized state. Bytes : "
+                           + ((byte[]) state).length);
             }
 
             try
@@ -400,7 +401,7 @@ class DefaultFaceletsStateManagementHelp
                         {
                             public Object[] run() throws PrivilegedActionException, IOException, ClassNotFoundException
                             {
-                                return new Object[] {in.readObject(), in.readObject()};                                    
+                                return new Object[] {in.readObject(), in.readObject()};
                             }
                         });
                     }
@@ -451,7 +452,8 @@ class DefaultFaceletsStateManagementHelp
         }
         else
         {
-            log.severe("Exiting deserializeView - this method should not be called with a state of type : "+state.getClass());
+            log.severe("Exiting deserializeView - this method should not be called with a state of type : "
+                       + state.getClass());
             return null;
         }
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java Sat Oct 29 09:28:45 2011
@@ -125,8 +125,10 @@ public class DefaultFaceletsStateManagem
      * 
      * This param is just provided to preserve backwards behavior. 
      */
-    @JSFWebConfigParam(since="2.0.8, 2.1.2", defaultValue="true", expectedValues="true, false", group="state", tags="performance")
-    public static final String SAVE_STATE_WITH_VISIT_TREE_ON_PSS = "org.apache.myfaces.SAVE_STATE_WITH_VISIT_TREE_ON_PSS";
+    @JSFWebConfigParam(since="2.0.8, 2.1.2", defaultValue="true", expectedValues="true, false",
+                       group="state", tags="performance")
+    public static final String SAVE_STATE_WITH_VISIT_TREE_ON_PSS
+            = "org.apache.myfaces.SAVE_STATE_WITH_VISIT_TREE_ON_PSS";
     
     private static final String SKIP_ITERATION_HINT = "javax.faces.visit.SKIP_ITERATION";
     
@@ -141,7 +143,8 @@ public class DefaultFaceletsStateManagem
     
     public DefaultFaceletsStateManagementStrategy ()
     {
-        _vdlFactory = (ViewDeclarationLanguageFactory)FactoryFinder.getFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY);
+        _vdlFactory = (ViewDeclarationLanguageFactory)
+                FactoryFinder.getFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY);
         //TODO: This object should be application scoped and shared
         //between jsp and facelets
     }
@@ -161,7 +164,6 @@ public class DefaultFaceletsStateManagem
         // Get previous state from ResponseStateManager.
         manager = getRenderKitFactory().getRenderKit(context, renderKitId).getResponseStateManager();
         
-        //state = (Object[]) getStateCache().restoreSerializedView(context, viewId, manager.getState(context, viewId));
         state = (Object[]) manager.getState(context, viewId);
         
         if (state == null)
@@ -211,7 +213,8 @@ public class DefaultFaceletsStateManagem
                 if (state != null && state[1] != null)
                 {
                     states = (Map<String, Object>) state[1];
-                    faceletViewState = UIComponentBase.restoreAttachedState(context,states.get(ComponentSupport.FACELET_STATE_INSTANCE));
+                    faceletViewState = UIComponentBase.restoreAttachedState(
+                            context,states.get(ComponentSupport.FACELET_STATE_INSTANCE));
                     if (faceletViewState != null)
                     {
                         view.getAttributes().put(ComponentSupport.FACELET_STATE_INSTANCE,  faceletViewState);
@@ -286,7 +289,8 @@ public class DefaultFaceletsStateManagem
                                                     String key = null;
                                                     if (target.getParent().getFacetCount() > 0)
                                                     {
-                                                        for (Map.Entry<String, UIComponent> entry : target.getParent().getFacets().entrySet())
+                                                        for (Map.Entry<String, UIComponent> entry :
+                                                                target.getParent().getFacets().entrySet())
                                                         {
                                                             if (entry.getValue()==target)
                                                             {
@@ -331,7 +335,8 @@ public class DefaultFaceletsStateManagem
                                 {
                                     if (addedState.length == 2)
                                     {
-                                        view = (UIViewRoot) internalRestoreTreeStructure((TreeStructComponent) addedState[0]);
+                                        view = (UIViewRoot)
+                                                internalRestoreTreeStructure((TreeStructComponent) addedState[0]);
                                         view.processRestoreState(context, addedState[1]);
                                         break;
                                     }
@@ -346,14 +351,18 @@ public class DefaultFaceletsStateManagem
                                                 if (addedState[1] != null)
                                                 {
                                                     String facetName = (String) addedState[1];
-                                                    UIComponent child = internalRestoreTreeStructure((TreeStructComponent) addedState[3]);
+                                                    UIComponent child
+                                                            = internalRestoreTreeStructure((TreeStructComponent)
+                                                                                           addedState[3]);
                                                     child.processRestoreState(context, addedState[4]);
                                                     target.getFacets().put(facetName,child);
                                                 }
                                                 else
                                                 {
                                                     Integer childIndex = (Integer) addedState[2];
-                                                    UIComponent child = internalRestoreTreeStructure((TreeStructComponent) addedState[3]);
+                                                    UIComponent child
+                                                            = internalRestoreTreeStructure((TreeStructComponent)
+                                                                                           addedState[3]);
                                                     child.processRestoreState(context, addedState[4]);
                                                     try
                                                     {
@@ -403,43 +412,6 @@ public class DefaultFaceletsStateManagem
         return view;
     }
     
-    /*
-    private static void _publishPostBuildComponentTreeOnRestoreViewEvent(FacesContext context, UIComponent component)
-    {
-        context.getApplication().publishEvent(context, PostBuildComponentTreeOnRestoreViewEvent.class, UIComponent.class, component);
-        
-        if (component.getChildCount() > 0)
-        {
-            // PostAddToViewEvent could cause component relocation
-            // (h:outputScript, h:outputStylesheet, composite:insertChildren, composite:insertFacet)
-            // so we need to check if the component was relocated or not
-            List<UIComponent> children = component.getChildren();
-            UIComponent child = null;
-            UIComponent currentChild = null;
-            int i = 0;
-            while (i < children.size())
-            {
-                child = children.get(i);
-                // Iterate over the same index if the component was removed
-                // This prevents skip components when processing
-                do 
-                {
-                    _publishPostBuildComponentTreeOnRestoreViewEvent(context, child);
-                    currentChild = child;
-                }
-                while ((i < children.size()) &&
-                       ((child = children.get(i)) != currentChild) );
-                i++;
-            }
-        }
-        if (component.getFacetCount() > 0)
-        {
-            for (UIComponent child : component.getFacets().values())
-            {
-                _publishPostBuildComponentTreeOnRestoreViewEvent(context, child);
-            }
-        }        
-    }*/
 
     @Override
     public Object saveView (FacesContext context)
@@ -493,7 +465,8 @@ public class DefaultFaceletsStateManagem
                 Object faceletViewState = view.getAttributes().get(ComponentSupport.FACELET_STATE_INSTANCE);
                 if (faceletViewState != null)
                 {
-                    ((Map<String, Object>)states).put(ComponentSupport.FACELET_STATE_INSTANCE, UIComponentBase.saveAttachedState(context, faceletViewState));
+                    ((Map<String, Object>)states).put(ComponentSupport.FACELET_STATE_INSTANCE,
+                            UIComponentBase.saveAttachedState(context, faceletViewState));
                     //Do not save on UIViewRoot
                     view.getAttributes().remove(ComponentSupport.FACELET_STATE_INSTANCE);
                 }
@@ -524,22 +497,6 @@ public class DefaultFaceletsStateManagem
 
             externalContext.getRequestMap().put(SERIALIZED_VIEW_REQUEST_ATTR, serializedView);
 
-            /*
-            if (context.getApplication().getStateManager().isSavingStateInClient(context))
-            {
-                serializedView = new Object[] { null, states };
-            }
-            else
-            {
-                // On server side state saving, the structure field is used to save the view sequence.
-                // Originally, on JspStateManagerImpl this is done in writeState method, not in saveView,
-                // but note that on ajax case the state is both saved and written using StateManager.getViewState,
-                // so we must save it early
-                serializedView = new Object[] {Integer.toString(helper.getNextViewSequence(context), Character.MAX_RADIX), states};
-            }
-            externalContext.getRequestMap().put(DefaultFaceletsStateManagementHelper.SERIALIZED_VIEW_REQUEST_ATTR,
-                    serializedView);
-            */
         }
         
         //if (!context.getApplication().getStateManager().isSavingStateInClient(context))
@@ -713,7 +670,8 @@ public class DefaultFaceletsStateManagem
                         return VisitResult.REJECT;
                     }
                     
-                    ComponentState componentAddedAfterBuildView = (ComponentState) target.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
+                    ComponentState componentAddedAfterBuildView
+                            = (ComponentState) target.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
                     
                     //Note if UIViewRoot has this marker, JSF 1.2 like state saving is used.
                     if (componentAddedAfterBuildView != null && (target.getParent() != null))
@@ -821,7 +779,8 @@ public class DefaultFaceletsStateManagem
                     UIComponent child = children.get(i);
                     if (child != null && !child.isTransient())
                     {
-                        componentAddedAfterBuildView = (ComponentState) child.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
+                        componentAddedAfterBuildView
+                                = (ComponentState) child.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
                         if (componentAddedAfterBuildView != null)
                         {
                             if (ComponentState.REMOVE_ADD.equals(componentAddedAfterBuildView))
@@ -869,7 +828,8 @@ public class DefaultFaceletsStateManagem
                     if (child != null && !child.isTransient())
                     {
                         String facetName = entry.getKey();
-                        componentAddedAfterBuildView = (ComponentState) child.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
+                        componentAddedAfterBuildView
+                                = (ComponentState) child.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
                         if (componentAddedAfterBuildView != null)
                         {
                             if (ComponentState.REMOVE_ADD.equals(componentAddedAfterBuildView))

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java Sat Oct 29 09:28:45 2011
@@ -42,7 +42,8 @@ abstract public class FaceletComposition
     
     static public FaceletCompositionContext getCurrentInstance()
     {
-        return (FaceletCompositionContext) FacesContext.getCurrentInstance().getAttributes().get(FACELET_COMPOSITION_CONTEXT_KEY);
+        return (FaceletCompositionContext)
+                FacesContext.getCurrentInstance().getAttributes().get(FACELET_COMPOSITION_CONTEXT_KEY);
     }
     
     static public FaceletCompositionContext getCurrentInstance(FaceletContext ctx)
@@ -56,7 +57,8 @@ abstract public class FaceletComposition
             // Here we have two choices: retrieve it throught ThreadLocal var
             // or use the attribute value on FacesContext, but it seems better
             // use the FacesContext attribute map.
-            return (FaceletCompositionContext) ctx.getFacesContext().getAttributes().get(FACELET_COMPOSITION_CONTEXT_KEY);
+            return (FaceletCompositionContext)
+                    ctx.getFacesContext().getAttributes().get(FACELET_COMPOSITION_CONTEXT_KEY);
         }
     }
     
@@ -269,7 +271,7 @@ abstract public class FaceletComposition
      * Marks all direct children and Facets with an attribute for deletion.
      *
      * @since 2.0.2
-     * @see #finalizeForDeletion(FaceletCompositionContext, UIComponent)
+     * @see #finalizeForDeletion(UIComponent)
      * @param component
      *            UIComponent to mark
      */
@@ -288,11 +290,12 @@ abstract public class FaceletComposition
      * Add a method expression as targeted for the provided composite component
      * 
      * @since 2.0.3
-     * @param compositeComponentParent
+     * @param targetedComponent
      * @param attributeName
      * @param backingValue A value that could be useful to revert its effects.
      */
-    public abstract void addMethodExpressionTargeted(UIComponent targetedComponent, String attributeName, Object backingValue);
+    public abstract void addMethodExpressionTargeted(UIComponent targetedComponent, String attributeName,
+                                                     Object backingValue);
 
     /**
      * Check if the MethodExpression attribute has been applied using vdl.retargetMethodExpression 
@@ -302,7 +305,8 @@ abstract public class FaceletComposition
      * @param attributeName
      * @return
      */
-    public abstract boolean isMethodExpressionAttributeApplied(UIComponent compositeComponentParent, String attributeName);
+    public abstract boolean isMethodExpressionAttributeApplied(UIComponent compositeComponentParent,
+                                                               String attributeName);
     
     /**
      * Mark the MethodExpression attribute as applied using vdl.retargetMethodExpression
@@ -326,7 +330,7 @@ abstract public class FaceletComposition
      * Remove a method expression as targeted for the provided composite component
      * 
      * @since 2.0.3
-     * @param compositeComponentParent
+     * @param targetedComponent
      * @param attributeName
      * @return A value that could be useful to revert its effects.
      */

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java Sat Oct 29 09:28:45 2011
@@ -90,7 +90,8 @@ public abstract class FaceletFactory
      * @throws FacesException
      * @throws ELException
      */
-    public abstract Facelet getViewMetadataFacelet(URL url) throws IOException, FaceletException, FacesException, ELException;
+    public abstract Facelet getViewMetadataFacelet(URL url)
+            throws IOException, FaceletException, FacesException, ELException;
 
     /**
      * Return a Facelet instance as specified by the file at the passed URI. The returned facelet is used
@@ -118,7 +119,8 @@ public abstract class FaceletFactory
      * @throws FacesException
      * @throws ELException
      */
-    public abstract Facelet getCompositeComponentMetadataFacelet(URL url) throws IOException, FaceletException, FacesException, ELException;
+    public abstract Facelet getCompositeComponentMetadataFacelet(URL url)
+            throws IOException, FaceletException, FacesException, ELException;
     
     /**
      * Set the static instance