You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/06/24 22:09:45 UTC
svn commit: r1687356 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-core/src/main/faces-config/ tobago-core/src/main/resources/META-INF/
tobago-extension/tobago-fileupload/src/main/resources/META-INF/
tobago-extension/tobago-sandbox/src/main/fac...
Author: lofwyr
Date: Wed Jun 24 20:09:45 2015
New Revision: 1687356
URL: http://svn.apache.org/r1687356
Log:
Merged from trunk
TOBAGO-1463: Define ordering in the faces-config.xml files. [from revision 1687354]
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/faces-config/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 24 20:09:45 2015
@@ -1,3 +1,3 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664,1686204
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664,1686204,1687354
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/faces-config/faces-config.xml?rev=1687356&r1=1687355&r2=1687356&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/faces-config/faces-config.xml Wed Jun 24 20:09:45 2015
@@ -23,6 +23,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
+ <name>tobago_core</name>
+
<application>
<default-render-kit-id>tobago</default-render-kit-id>
</application>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml?rev=1687356&r1=1687355&r2=1687356&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml Wed Jun 24 20:09:45 2015
@@ -23,6 +23,14 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
+ <name>tobago_fileupload</name>
+
+ <ordering>
+ <after>
+ <name>tobago_core</name>
+ </after>
+ </ordering>
+
<factory>
<faces-context-factory>org.apache.myfaces.tobago.fileupload.FileUploadFacesContextFactoryImpl</faces-context-factory>
</factory>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml?rev=1687356&r1=1687355&r2=1687356&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml Wed Jun 24 20:09:45 2015
@@ -23,4 +23,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
+ <name>tobago_sandbox</name>
+
</faces-config>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml?rev=1687356&r1=1687355&r2=1687356&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml Wed Jun 24 20:09:45 2015
@@ -22,6 +22,14 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
+ <name>tobago_security</name>
+
+ <ordering>
+ <after>
+ <name>tobago_core</name>
+ </after>
+ </ordering>
+
<component>
<component-type>org.apache.myfaces.tobago.Command</component-type>
<component-class>org.apache.myfaces.tobago.security.UISecuredCommand</component-class>