You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/09 15:48:10 UTC
svn commit: r920901 - in /myfaces/extensions/scripting/trunk/core:
core/src/main/resources/META-INF/faces-config.xml
myfaces12-extensions/src/main/resources/META-INF/faces-config.xml
myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
Author: werpu
Date: Tue Mar 9 14:48:09 2010
New Revision: 920901
URL: http://svn.apache.org/viewvc?rev=920901&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-92
It turns out there was a bug in our bundeling, the core faces-config was overwritten by our local ones,
I now merged the core faces config into our submodule faces-configs to have only one per bundle which then never is overwritten.
Removed:
myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml
Modified:
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/resources/META-INF/faces-config.xml
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/resources/META-INF/faces-config.xml?rev=920901&r1=920900&r2=920901&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/resources/META-INF/faces-config.xml Tue Mar 9 14:48:09 2010
@@ -41,4 +41,34 @@
org.apache.myfaces.scripting.jsf.dynamicdecorators.factories.ScriptingRenderkitFactory
</render-kit-factory>
</factory>
+
+ <lifecycle>
+ <phase-listener>org.apache.myfaces.scripting.jsf.RefreshPhaseListener</phase-listener>
+ </lifecycle>
+
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.CompilerComponent</component-type>
+ <component-class>org.apache.myfaces.scripting.components.CompilerComponent</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.TaintHistory</component-type>
+ <component-class>org.apache.myfaces.scripting.components.TaintHistory</component-class>
+ </component>
+
+
+ <render-kit>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-class>
+ </renderer>
+
+ </render-kit>
+
</faces-config>
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml?rev=920901&r1=920900&r2=920901&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml Tue Mar 9 14:48:09 2010
@@ -23,6 +23,36 @@
* under the License.
-->
+ <lifecycle>
+ <phase-listener>org.apache.myfaces.scripting.jsf.RefreshPhaseListener</phase-listener>
+ </lifecycle>
+
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.CompilerComponent</component-type>
+ <component-class>org.apache.myfaces.scripting.components.CompilerComponent</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.TaintHistory</component-type>
+ <component-class>org.apache.myfaces.scripting.components.TaintHistory</component-class>
+ </component>
+
+
+ <render-kit>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-class>
+ </renderer>
+
+ </render-kit>
+
+
<factory>
<!--
all these factories are replacements for the normal ones