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/12/07 21:14:57 UTC
svn commit: r1773147 - in /myfaces/tobago/trunk:
tobago-core/src/main/resources/org/apache/myfaces/tobago/config/
tobago-extension/tobago-sandbox/src/main/resources/META-INF/
tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/
tobago-...
Author: lofwyr
Date: Wed Dec 7 21:14:57 2016
New Revision: 1773147
URL: http://svn.apache.org/viewvc?rev=1773147&view=rev
Log:
TOBAGO-1636: End of theme-dependent resource selection (ResourceManager)
* clean up: remove unused property from schema
Modified:
myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-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=1773147&r1=1773146&r2=1773147&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 Wed Dec 7 21:14:57 2016
@@ -154,7 +154,6 @@
<xs:sequence>
<xs:element name="name" type="xs:string"/>
<xs:element name="display-name" type="xs:string" minOccurs="0"/>
- <xs:element name="resource-path" type="xs:string"/>
<xs:element name="fallback" type="xs:string" minOccurs="0"/>
<xs:element name="versioned" type="xs:boolean" minOccurs="0" default="false"/>
<xs:element name="renderers" type="tobago:renderers-type" minOccurs="0"/>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml?rev=1773147&r1=1773146&r2=1773147&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:14:57 2016
@@ -20,8 +20,8 @@
<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-sandbox</name>
<ordering>
<after>
@@ -32,7 +32,6 @@
<theme-definition>
<name>sandbox</name>
<display-name>Sandbox Theme</display-name>
- <resource-path>org/apache/myfaces/tobago/sandbox</resource-path>
<fallback>speyside</fallback>
<versioned>false</versioned>
<resources production="true">
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml?rev=1773147&r1=1773146&r2=1773147&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:14:57 2016
@@ -32,7 +32,6 @@
<theme-definition>
<name>charlotteville</name>
<display-name>Charlotteville</display-name>
- <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml?rev=1773147&r1=1773146&r2=1773147&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:14:57 2016
@@ -32,7 +32,6 @@
<theme-definition>
<name>richmond</name>
<display-name>Richmond</display-name>
- <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml?rev=1773147&r1=1773146&r2=1773147&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml Wed Dec 7 21:14:57 2016
@@ -32,7 +32,6 @@
<theme-definition>
<name>scarborough</name>
<display-name>Scarborough</display-name>
- <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
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=1773147&r1=1773146&r2=1773147&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 Wed Dec 7 21:14:57 2016
@@ -32,7 +32,6 @@
<theme-definition>
<name>speyside</name>
<display-name>Speyside</display-name>
- <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
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=1773147&r1=1773146&r2=1773147&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 Wed Dec 7 21:14:57 2016
@@ -33,7 +33,6 @@
<theme-definition>
<name>standard</name>
<display-name>Standard Theme</display-name>
- <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<versioned>true</versioned>
<renderers>
<renderer>