Author: jwaldman
Date: Mon Feb 12 14:39:53 2007
New Revision: 506720
URL: http://svn.apache.org/viewvc?view=rev&rev=506720
Log:
oops. revert previous checkin. I accidentally checked ok and checked in when I
didn't want to.
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml?view=diff&rev=506720&r1=506719&r2=506720
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
Mon Feb 12 14:39:53 2007
@@ -25,8 +25,7 @@
<accessibility-mode>#{prefs.proxy.accessibilityMode}</accessibility-mode>
<!-- you can use EL to get the skin. This allows the skin to change between
requests. -->
- <skin-family>purple</skin-family>
- <!--
+ <skin-family>#{prefs.proxy.skinFamily}</skin-family> <!--
<output-mode>portlet</output-mode>
-->
<!-- Uncomment any of these to enable them -->
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml?view=diff&rev=506720&r1=506719&r2=506720
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
Mon Feb 12 14:39:53 2007
@@ -20,14 +20,6 @@
-->
<skins xmlns="http://myfaces.apache.org/trinidad/skin";>
<skin>
- <id>uni.desktop</id>
- <family>uni</family>
- <render-kit-id>org.apache.myfaces.trinidad.desktop</render-kit-id>
-
<style-sheet-name>http://bali:8888/faces-11/adf/styles/cache/richdemo-desktop-unknown-version-rtl-gecko.css</style-sheet-name>
- </skin>
-
-
- <skin>
<id>
purple.desktop
</id>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java?view=diff&rev=506720&r1=506719&r2=506720
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Mon Feb 12 14:39:53 2007
@@ -176,11 +176,7 @@
{
try
{
- if (name.startsWith("http:") ||
- name.startsWith("https:") ||
- name.startsWith("file:") ||
- name.startsWith("ftp:") ||
- name.startsWith("jar:"))
+ if (name.startsWith("http:"))
{
URL url = new URL(name);
if (url != null)
