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 2012/05/23 17:35:57 UTC

svn commit: r1341901 - in /myfaces/tobago/trunk: tobago-example/tobago-theme-example/src/main/resources/META-INF/ tobago-extension/tobago-sandbox/src/main/resources/META-INF/ tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/ tobago-...

Author: lofwyr
Date: Wed May 23 15:35:56 2012
New Revision: 1341901

URL: http://svn.apache.org/viewvc?rev=1341901&view=rev
Log:
TOBAGO-1143: Setting tobago-theme.xml to deprecated
 - using tobago-config.xml instead

Added:
    myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml   (contents, props changed)
      - copied, changed from r1338534, myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml   (contents, props changed)
      - copied, changed from r1339059, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml   (contents, props changed)
      - copied, changed from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml   (contents, props changed)
      - copied, changed from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml   (contents, props changed)
      - copied, changed from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-theme.xml
Removed:
    myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-theme.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-theme.xml
Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml

Copied: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml (from r1338534, myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml?p2=myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml&p1=myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml&r1=1338534&r2=1341901&rev=1341901&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml Wed May 23 15:35:56 2012
@@ -17,26 +17,40 @@
  * limitations under the License.
 -->
 
-<tobago-theme>
-  <name>example</name>
-  <display-name>Example Theme</display-name>
-  <deprecated-name>org.apache.myfaces.tobago.context.ExampleTheme</deprecated-name>
-  <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
-  <fallback>speyside</fallback>
-  <renderers>
-    <renderer>
-      <name>In</name>
-      <supported-markup>
-        <markup>changeaware</markup>
-        <markup>blink</markup>
-      </supported-markup>
-    </renderer>
-    <renderer>
-      <name>Sheet</name>
-      <supported-markup>
-        <markup>new</markup>
-        <markup>none</markup>
-      </supported-markup>
-    </renderer>
-  </renderers>
-</tobago-theme>
+<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-1.5.xsd"
+    version="1.5">
+  <name>tobago-theme-example</name>
+  <ordering>
+    <after>
+      <name>tobago-theme-standard</name>
+    </after>
+  </ordering>
+  <theme-definitions>
+    <theme-definition>
+      <name>example</name>
+      <display-name>Example Theme</display-name>
+      <deprecated-name>org.apache.myfaces.tobago.context.ExampleTheme</deprecated-name>
+      <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
+      <fallback>speyside</fallback>
+      <renderers>
+        <renderer>
+          <name>In</name>
+          <supported-markup>
+            <markup>changeaware</markup>
+            <markup>blink</markup>
+          </supported-markup>
+        </renderer>
+        <renderer>
+          <name>Sheet</name>
+          <supported-markup>
+            <markup>new</markup>
+            <markup>none</markup>
+          </supported-markup>
+        </renderer>
+      </renderers>
+    </theme-definition>
+  </theme-definitions>
+</tobago-config>

Propchange: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml (from r1339059, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-theme.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml?p2=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml&p1=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-theme.xml&r1=1339059&r2=1341901&rev=1341901&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml Wed May 23 15:35:56 2012
@@ -17,10 +17,24 @@
  * limitations under the License.
 -->
 
-<tobago-theme>
-  <name>sandbox</name>
-  <display-name>Sandbox Theme</display-name>
-  <deprecated-name>org.apache.myfaces.tobago.context.SandboxTheme</deprecated-name>
-  <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
-  <fallback>speyside</fallback>
-</tobago-theme>
+<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-1.5.xsd"
+    version="1.5">
+  <name>tobago-sandbox</name>
+  <ordering>
+    <after>
+      <name>tobago-theme-speyside</name>
+    </after>
+  </ordering>
+  <theme-definitions>
+    <theme-definition>
+      <name>sandbox</name>
+      <display-name>Sandbox Theme</display-name>
+      <deprecated-name>org.apache.myfaces.tobago.context.SandboxTheme</deprecated-name>
+      <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
+      <fallback>speyside</fallback>
+    </theme-definition>
+  </theme-definitions>
+</tobago-config>

Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml (from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-theme.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-theme.xml&r1=1338534&r2=1341901&rev=1341901&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml Wed May 23 15:35:56 2012
@@ -17,10 +17,24 @@
  * limitations under the License.
 -->
 
-<tobago-theme>
-  <name>charlotteville</name>
-  <display-name>Charlotteville</display-name>
-  <deprecated-name>org.apache.myfaces.tobago.context.CharlottevilleTheme</deprecated-name>
-  <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
-  <fallback>speyside</fallback>
-</tobago-theme>
+<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-1.5.xsd"
+    version="1.5">
+  <name>tobago-theme-charlotteville</name>
+  <ordering>
+    <after>
+      <name>tobago-theme-speyside</name>
+    </after>
+  </ordering>
+  <theme-definitions>
+    <theme-definition>
+      <name>charlotteville</name>
+      <display-name>Charlotteville</display-name>
+      <deprecated-name>org.apache.myfaces.tobago.context.CharlottevilleTheme</deprecated-name>
+      <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
+      <fallback>speyside</fallback>
+    </theme-definition>
+  </theme-definitions>
+</tobago-config>

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml (from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-theme.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-theme.xml&r1=1338534&r2=1341901&rev=1341901&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml Wed May 23 15:35:56 2012
@@ -17,10 +17,24 @@
  * limitations under the License.
 -->
 
-<tobago-theme>
-  <name>richmond</name>
-  <display-name>Richmond</display-name>
-  <deprecated-name>org.apache.myfaces.tobago.context.RichmondTheme</deprecated-name>
-  <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
-  <fallback>speyside</fallback>
-</tobago-theme>
+<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-1.5.xsd"
+    version="1.5">
+  <name>tobago-theme-richmond</name>
+  <ordering>
+    <after>
+      <name>tobago-theme-speyside</name>
+    </after>
+  </ordering>
+  <theme-definitions>
+    <theme-definition>
+      <name>richmond</name>
+      <display-name>Richmond</display-name>
+      <deprecated-name>org.apache.myfaces.tobago.context.RichmondTheme</deprecated-name>
+      <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
+      <fallback>speyside</fallback>
+    </theme-definition>
+  </theme-definitions>
+</tobago-config>

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml (from r1338534, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-theme.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-theme.xml&r1=1338534&r2=1341901&rev=1341901&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml Wed May 23 15:35:56 2012
@@ -17,10 +17,24 @@
  * limitations under the License.
 -->
 
-<tobago-theme>
-  <name>scarborough</name>
-  <display-name>Scarborough</display-name>
-  <deprecated-name>org.apache.myfaces.tobago.context.ScarboroughTheme</deprecated-name>
-  <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
-  <fallback>standard</fallback>
-</tobago-theme>
+<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-1.5.xsd"
+    version="1.5">
+  <name>tobago-theme-scarborough</name>
+  <ordering>
+    <after>
+      <name>tobago-theme-standard</name>
+    </after>
+  </ordering>
+  <theme-definitions>
+    <theme-definition>
+      <name>scarborough</name>
+      <display-name>Scarborough</display-name>
+      <deprecated-name>org.apache.myfaces.tobago.context.ScarboroughTheme</deprecated-name>
+      <resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
+      <fallback>standard</fallback>
+    </theme-definition>
+  </theme-definitions>
+</tobago-config>

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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=1341901&r1=1341900&r2=1341901&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 May 23 15:35:56 2012
@@ -26,8 +26,6 @@
   <ordering>
     <after>
       <name>tobago-theme-scarborough</name>
-      <!-- todo remove link to standard, after adding it to the scarborough tobago-config.xml -->
-      <name>tobago-theme-standard</name>
     </after>
   </ordering>
   <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>