Author: nbelaevski Date: 2011-02-18 09:08:26 -0500 (Fri, 18 Feb 2011) New Revision: 21763 Removed: trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml Modified: trunk/core/impl/src/main/resources/META-INF/ trunk/core/impl/src/main/resources/META-INF/faces-config.xml Log: https://issues.jboss.org/browse/RF-10543 Property changes on: trunk/core/impl/src/main/resources/META-INF ___________________________________________________________________ Modified: svn:ignore - target .settings .project .classpath .clover + target .settings .project .classpath .clover *.jsfdia Deleted: trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0"> - <factory> - <external-context-factory>org.richfaces.context.SkinningExternalContextFactory</external-context-factory> - <partial-view-context-factory>org.richfaces.context.ExtendedPartialViewContextFactoryImpl</partial-view-context-factory> - </factory> - - <application> - <system-event-listener> - <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker - </system-event-listener-class> - <system-event-class>javax.faces.event.PreRemoveFromViewEvent - </system-event-class> - </system-event-listener> - <system-event-listener> - <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker - </system-event-listener-class> - <system-event-class>javax.faces.event.PostAddToViewEvent - </system-event-class> - </system-event-listener> - </application> - <component> - <component-type>org.richfaces.Scripts</component-type> - <component-class>org.richfaces.component.UIScripts</component-class> - </component> - -</faces-config> Modified: trunk/core/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,71 +1,81 @@ <?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="2.0"> - <application> - <!-- system-event-listener> - <system-event-listener-class>org.ajax4jsf.component.RenderPhaseUIDataAdaptorVisitor</system-event-listener-class> - <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class> - <source-class>org.ajax4jsf.component.UIDataAdaptor</source-class> - </system-event-listener --> - <!-- - <view-handler>org.ajax4jsf.application.AjaxViewHandler</view-handler> - --> - <!-- state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager --> - <el-resolver>org.richfaces.skin.SkinPropertiesELResolver</el-resolver> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> + + <name>richfaces_core</name> + + <application> <system-event-listener> + <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreDestroyApplicationEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class> + <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class> + </system-event-listener> + <system-event-listener> <system-event-listener-class>org.richfaces.skin.SkinFactoryPreRenderViewListener</system-event-listener-class> <system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class> </system-event-listener> - </application> + <system-event-listener> + <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker + </system-event-listener-class> + <system-event-class>javax.faces.event.PreRemoveFromViewEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker</system-event-listener-class> + <system-event-class>javax.faces.event.PostAddToViewEvent</system-event-class> + </system-event-listener> + <view-handler>org.richfaces.application.GlobalResourcesViewHandler</view-handler> + <resource-handler>org.richfaces.resource.ResourceHandlerImpl</resource-handler> + <el-resolver>org.richfaces.skin.SkinPropertiesELResolver</el-resolver> + <el-resolver>org.richfaces.resource.ResourceParameterELResolver</el-resolver> + </application> + + <factory> + <external-context-factory>org.richfaces.context.SkinningExternalContextFactory</external-context-factory> + <partial-view-context-factory>org.richfaces.context.ExtendedPartialViewContextFactoryImpl</partial-view-context-factory> + </factory> + <managed-bean> - <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.richfaces.VersionBean + </managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> - <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean + </managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> - <managed-bean-name>richSkin</managed-bean-name> - <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> + <managed-bean-name>richSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean + </managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> </managed-bean> - <!-- component> - <component-type>javax.faces.ViewRoot</component-type> - <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> + <component> + <component-type>org.richfaces.Scripts</component-type> + <component-class>org.richfaces.component.UIScripts</component-class> + </component> + + <render-kit> + <renderer> + <component-family>org.richfaces.Script</component-family> + <renderer-type>org.richfaces.renderer.ScriptsRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.ScriptsRenderer + </renderer-class> + </renderer> + <renderer> + <component-family>javax.faces.Output</component-family> + <renderer-type>org.richfaces.renderkit.ResourceLibraryRenderer + </renderer-type> + <renderer-class>org.richfaces.renderkit.html.ResourceLibraryRenderer + </renderer-class> + </renderer> + </render-kit> - <component-extension> - <component-family>javax.faces.ViewRoot</component-family> - </component-extension> - - </component --> - - <!-- render-kit> - - <renderer> - <description> - override the viewroot - </description> - <component-family>javax.faces.ViewRoot</component-family> - <renderer-type>javax.faces.ViewRoot</renderer-type> - <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> - </renderer --> - <!-- - <renderer> - <component-family>javax.faces.Form</component-family> - <renderer-type>javax.faces.Form</renderer-type> - <renderer-class>org.ajax4jsf.renderkit.html.AjaxFormRenderer</renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Command</component-family> - <renderer-type>javax.faces.Link</renderer-type> - <renderer-class>org.ajax4jsf.renderkit.html.HtmlCommandLinkRenderer</renderer-class> - </renderer> - --> - <!-- /render-kit --> - </faces-config> Deleted: trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> - <name>richfaces</name> - - <application> - <view-handler>org.richfaces.application.GlobalResourcesViewHandler</view-handler> - </application> - -</faces-config> \ No newline at end of file Deleted: trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> - <name>richfaces</name> - <application> - <system-event-listener> - <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class> - <system-event-class>javax.faces.event.PreDestroyApplicationEvent</system-event-class> - </system-event-listener> - <system-event-listener> - <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class> - <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class> - </system-event-listener> - </application> - - -</faces-config> \ No newline at end of file Deleted: trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - version="2.0"> - <name>richfaces</name> - - <application> - <resource-handler>org.richfaces.resource.ResourceHandlerImpl</resource-handler> - <el-resolver>org.richfaces.resource.ResourceParameterELResolver</el-resolver> - </application> -</faces-config> Deleted: trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762) +++ trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763) @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - version="2.0"> - <name>richfaces</name> - - <render-kit> - <renderer> - <component-family>org.richfaces.Script</component-family> - <renderer-type>org.richfaces.renderer.ScriptsRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.ScriptsRenderer - </renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Output</component-family> - <renderer-type>org.richfaces.renderkit.ResourceLibraryRenderer - </renderer-type> - <renderer-class>org.richfaces.renderkit.html.ResourceLibraryRenderer - </renderer-class> - </renderer> - </render-kit> - -</faces-config>