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/07/10 14:08:51 UTC
svn commit: r1359627 - in /myfaces/tobago/trunk: src/site/apt/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/test/resources/
tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/s...
Author: lofwyr
Date: Tue Jul 10 12:08:49 2012
New Revision: 1359627
URL: http://svn.apache.org/viewvc?rev=1359627&view=rev
Log:
TOBAGO-1172: Normalize filenames of the JavaScript and CSS resources
- renaming CSS files from style.css to tobago.css
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/scarborough/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/speyside/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/speyside/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko_1_8/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko_1_8/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_8_0/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_8_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/presto/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/presto/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/webkit/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/webkit/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago.less
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/tobago.css
- copied unchanged from r1359602, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/style/tobago.css
- copied unchanged from r1359526, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/style/tobago.css
- copied unchanged from r1359526, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/style/style.css
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/speyside/standard/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/style/style.css
myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/gecko_1_8/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_8_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/presto/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/webkit/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/style/style.css
Modified:
myfaces/tobago/trunk/src/site/apt/guide.apt
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Modified: myfaces/tobago/trunk/src/site/apt/guide.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/guide.apt?rev=1359627&r1=1359626&r2=1359627&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/guide.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/guide.apt Tue Jul 10 12:08:49 2012
@@ -600,10 +600,13 @@ mvn install -Pall-modules
+------------------------------------------+
See the address book example
- {{{https://svn.apache.org/repos/asf/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-web/src/main/webapp/tobago-resource/html/speyside/standard/style/style.css}Speyside <<<style.css>>>}}.
+ {{{https://svn.apache.org/repos/asf/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-web/src/main/webapp/tobago-resource/html/speyside/standard/style/tobago.css}Speyside <<<tobago.css>>>}}.
- The <<<style.css>>> file is collected by the Tobago resource manager and can be used to overwrite and extend the
- default <<<style.css>>> file of the theme.
+ The <<<tobago.css>>> file is collected by the Tobago resource manager and can be used to overwrite and extend the
+ default <<<tobago.css>>> file of the theme.
+
+ Tobago 1.0.x and Tobago 1.5.x are using the old name <<<style.css>>>, since Tobago 1.6.0
+ <<<tobago.css>>> is used, <<<style.css>>> will also be included for compatibility.
The {{{https://svn.apache.org/repos/asf/myfaces/tobago/trunk/tobago-example/tobago-theme-example/}example theme}} provides
an example for styling sheet cells and contains more complex examples of markup, which need addtional JavaScript
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1359627&r1=1359626&r2=1359627&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Tue Jul 10 12:08:49 2012
@@ -290,7 +290,7 @@ public abstract class AbstractUIGridLayo
if (cell instanceof OriginCell) {
LayoutComponent component = cell.getComponent();
- component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
+ component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and tobago.css
Integer span = ((OriginCell) cell).getSpan(orientation);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1359627&r1=1359626&r2=1359627&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Tue Jul 10 12:08:49 2012
@@ -148,7 +148,7 @@ public abstract class AbstractUISheetLay
final LayoutComponentRenderer renderer = sheet.getLayoutComponentRenderer(facesContext);
width = width.subtractNotNegative(renderer.getCustomMeasure(facesContext, sheet, "columnSeparator"));
LayoutUtils.setCurrentSize(orientation, component, width);
- component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
+ component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and tobago.css
// call sub layout manager
if (component instanceof LayoutContainer) {
((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml?rev=1359627&r1=1359626&r2=1359627&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml Tue Jul 10 12:08:49 2012
@@ -24,11 +24,11 @@
<resource-path>Test</resource-path>
<resources production="true">
<script name="script/tobago.min.js"/>
- <style name="style.css"/>
+ <style name="tobago.css"/>
</resources>
<resources production="false">
<script name="script/tobago.js"/>
<script name="script/tobago-logging.js"/>
- <style name="style.css"/>
+ <style name="tobago.css"/>
</resources>
</tobago-theme>
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml?rev=1359627&r1=1359626&r2=1359627&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml Tue Jul 10 12:08:49 2012
@@ -25,6 +25,6 @@
<fallback>test</fallback>
<resources production="false">
<script name="script/test.js"/>
- <style name="style.css"/>
+ <style name="tobago.css"/>
</resources>
-</tobago-theme>
\ No newline at end of file
+</tobago-theme>
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=1359627&r1=1359626&r2=1359627&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 Tue Jul 10 12:08:49 2012
@@ -356,6 +356,8 @@
<resources production="true">
<script name="script/jquery-1.6.4.js"/>
<script name="script/tobago.js"/>
+ <style name="style/tobago.css"/>
+ <!-- backward compatibility -->
<style name="style/style.css"/>
</resources>
<resources production="false">
@@ -372,6 +374,8 @@
<script name="script/jquery-ui/1_7_2/ui.core.min.js"/>
<script name="script/jquery-ui/1_7_2/ui.draggable.min.js"/>
<script name="script/tobago-logging.js"/>
+ <style name="style/tobago.css"/>
+ <!-- backward compatibility -->
<style name="style/style.css"/>
</resources>
</theme-definition>