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 2016/11/26 07:29:17 UTC
svn commit: r1771433 - in /myfaces/tobago/trunk:
tobago-core/src/main/resources/org/apache/myfaces/tobago/config/
tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/
tobago-example/tobago-example-test/src/main/webapp/WEB-INF/
tobago-theme/toba...
Author: lofwyr
Date: Sat Nov 26 07:29:16 2016
New Revision: 1771433
URL: http://svn.apache.org/viewvc?rev=1771433&view=rev
Log:
TOBAGO-1636: End of theme-dependent resource selection (ResourceManager)
* remove <resource-dir> from 3.0 Schema
Modified:
myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd
myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Modified: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd?rev=1771433&r1=1771432&r2=1771433&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd Sat Nov 26 07:29:16 2016
@@ -62,7 +62,6 @@
<xs:element name="name" type="tobago:name-type" minOccurs="0"/>
<xs:element name="ordering" type="tobago:ordering-type" minOccurs="0"/>
<xs:element name="theme-config" type="tobago:theme-config-type" minOccurs="0"/>
- <xs:element name="resource-dir" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="create-session-secret" type="xs:boolean" minOccurs="0" default="true"/>
<xs:element name="check-session-secret" type="xs:boolean" minOccurs="0" default="true"/>
<xs:element name="prevent-frame-attacks" type="xs:boolean" minOccurs="0" default="true"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml?rev=1771433&r1=1771432&r2=1771433&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml Sat Nov 26 07:29:16 2016
@@ -20,13 +20,11 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-2.0.xsd"
- version="2.0">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-3.0.xsd"
+ version="3.0">
<theme-config>
<default-theme>speyside</default-theme>
</theme-config>
- <resource-dir>tobago-resource</resource-dir>
- <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>
</tobago-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml?rev=1771433&r1=1771432&r2=1771433&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml Sat Nov 26 07:29:16 2016
@@ -27,6 +27,8 @@
<supported-theme>richmond</supported-theme>
<supported-theme>charlotteville</supported-theme>
</theme-config>
+
+ <!-- XXX old -->
<resource-dir>tobago-resource</resource-dir>
<!-- because this application uses frames -->
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml?rev=1771433&r1=1771432&r2=1771433&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml Sat Nov 26 07:29:16 2016
@@ -28,7 +28,6 @@
<name>tobago-theme-standard</name>
</after>
</ordering>
- <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>
<theme-definitions>
<theme-definition>
<name>speyside</name>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1771433&r1=1771432&r2=1771433&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Sat Nov 26 07:29:16 2016
@@ -20,14 +20,11 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-2.0.xsd"
- version="2.0">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-3.0.xsd"
+ version="3.0">
<name>tobago-theme-standard</name>
- <!--XXX RM-->
- <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>
-
<content-security-policy mode="on">
<directive>default-src 'self'</directive>
</content-security-policy>