incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r483330 [1/37] - in /incubator/adffaces/branches/jwaldman-portal/trinidad: trinidad-demo/src/main/webapp/demos/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ trinidad-impl/src/main/java/org/apache/myf...
Date Thu, 07 Dec 2006 02:54:09 GMT
Author: jwaldman
Date: Wed Dec  6 18:53:58 2006
New Revision: 483330

URL: http://svn.apache.org/viewvc?view=rev&rev=483330
Log:
ADFFaces-231. URL Encoding Applied patch 3-ADFFACES-231.patch to jwaldman-portal branch

Modified:
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/demos/portletSkinDemo.jspx
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseColor-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationTree-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputDocument-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputFormatted-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelSideBar-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/script-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalPPC-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/singleStepButtonBar-minimal-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/singleStepButtonBar-minimalInacc-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/singleStepButtonBar-minimalSaf-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/singleStepButtonBar-minimalScrRdr-golden.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/demos/portletSkinDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/demos/portletSkinDemo.jspx?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/demos/portletSkinDemo.jspx (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/demos/portletSkinDemo.jspx Wed Dec  6 18:53:58 2006
@@ -38,14 +38,12 @@
 
             <tr:panelGroupLayout layout="vertical">
               <tr:outputText styleClass="portlet-font"
-                             value="When trinidad-config.xml's output-mode is 'portlet', 
-                             the page renders with portlet style classes. This way this page 
+                             value="When &lt;output-mode&gt;portlet&lt;/output-mode> 
+                             is defined in trinidad-config.xml's, all components map
+                             their styleclasses to portlet style classes. This way a Trinidad page 
                              will look like a portlet when it is running within a portlet.  
-                             We include a test portlet css file in this page. It defines portlet 
-                             styles like portlet-table-header and portlet-font. Set the output-mode 
-                             in trinidad-config.xml to 'portlet' when viewing this page. 
-                             When in the oracle skin, we generate images for some components, 
-                             like tabs. Therefore the portlet styles will not affect those components. "/>
+                             This page contains a test portlet css file that defines portlet 
+                             styles like portlet-table-header and portlet-font.  "/>
               <tr:panelGroupLayout layout="horizontal">
                 <tr:navigationPane hint="tabs" shortDesc="Select tab">
                   <tr:commandNavigationItem text="Home" action="guide.menuTabs"

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java Wed Dec  6 18:53:58 2006
@@ -65,11 +65,11 @@
       renderId(context, comp);
       renderAllAttributes(context, arc, bean, false);
       renderStyleAttributes(context, arc, bean, "AFLogo");
-      rw.writeAttribute(
+      renderEncodedResourceURI(
+        context,
         "src",
         context.getExternalContext().getRequestContextPath() +
-        "/adf/images/t.gif",
-        null);
+        "/adf/images/t.gif");
       rw.endElement("img");
     }
     else

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java Wed Dec  6 18:53:58 2006
@@ -541,7 +541,7 @@
 
       if (isURL)
       {
-        writer.writeURIAttribute("value", paramValue, null);
+        renderEncodedResourceURI(context, "value", paramValue);
       }
       else
       {

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Wed Dec  6 18:53:58 2006
@@ -524,7 +524,7 @@
     Application application = context.getApplication();
     ViewHandler handler = application.getViewHandler();
     String resolvedIconUri = handler.getResourceURL(context, iconUri);
-    rw.writeAttribute("src", resolvedIconUri, null);
+    renderEncodedResourceURI(context, "src", resolvedIconUri);
     rw.endElement("img");
   }
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java Wed Dec  6 18:53:58 2006
@@ -397,7 +397,7 @@
       }
       else
       {
-        writer.writeAttribute("src", "about:blank", null);
+        writer.writeURIAttribute("src", "about:blank", null);
       }
 
       Object width = "0";

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java Wed Dec  6 18:53:58 2006
@@ -742,7 +742,7 @@
     // Write out Javascript
     // FIXME: this would be far better just written as Javascript
     // with onclick
-    rw.writeURIAttribute("href", href, null);
+    renderEncodedActionURI(context, "href", href);
     Icon icon = rc.getIcon(iconName);
 
     // FIXME: the icon previously had "p_OraDisplayBlock" rendered on it.
@@ -766,7 +766,7 @@
   {
     ResponseWriter rw = context.getResponseWriter();
     rw.startElement("a", null);
-    rw.writeURIAttribute("href", href, null);
+    renderEncodedActionURI(context, "href", href);
     renderStyleClass(context,
                      rc,
                      href == null

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java Wed Dec  6 18:53:58 2006
@@ -103,8 +103,8 @@
                         "charset=\\\"UTF-8\\\" type=\\\"text/css\\\" " +
                         "href=\\\"",
 						null);
-          writer.writeText(baseURL, null);
-          writer.writeText(href, null);
+          String uri = context.getExternalContext().encodeActionURL(baseURL+href);
+          writer.writeText(uri, null);
           writer.writeText("\\\">\")}", null);
           writer.endElement("script");
         }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Wed Dec  6 18:53:58 2006
@@ -187,7 +187,7 @@
     {
       // The "safe" case: just write out the source
       libURL = context.getExternalContext().encodeResourceURL(libURL.toString());
-      writer.writeAttribute("src", libURL, null);
+      writer.writeURIAttribute("src", "about:blank", null);
     }
 
     writer.endElement("script");

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java Wed Dec  6 18:53:58 2006
@@ -141,11 +141,12 @@
     // Write out the src attr
     String baseURI = _getBaseURI(context, arc);
     String uri = getRelativeURI(context, arc);
-
+    
     if (baseURI == null)
-      writer.writeAttribute("src", uri, null);
+      writer.writeURIAttribute("src", context.getExternalContext().encodeResourceURL(uri), null);
     else
-      writer.writeAttribute("src", baseURI + uri, null);
+      writer.writeURIAttribute("src", 
+                            context.getExternalContext().encodeResourceURL(baseURI + uri), null);
 
     // Write out the width/height attrs
     Object width = _getWidth(arc, attrs);

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java Wed Dec  6 18:53:58 2006
@@ -18,6 +18,9 @@
 
 import java.io.IOException;
 
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.trinidadinternal.share.url.FacesURLEncoder;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -278,21 +281,28 @@
 
     // Create the buffer
     StringBuffer buffer = new StringBuffer(length);
-
-    // Add the start script and destination
+    StringBuffer urlBuffer = new StringBuffer(length);
+    // Add the start script
     buffer.append(startScript);
-    buffer.append(destination);
+
+    urlBuffer.append(destination);
 
     // Make sure we are in the query string portion of the URL
     if (destination.indexOf('?') == -1)
-      buffer.append("?");
+      urlBuffer.append("?");
 
-    appendURLParameter(buffer, eventKey, event);
-    appendURLParameter(buffer, sourceKey, source);
+    appendURLParameter(urlBuffer, eventKey, event);
+    appendURLParameter(urlBuffer, sourceKey, source);
     if ((extraKey != null) && (extraValue != null))
-      appendURLParameter(buffer, extraKey, extraValue);
-    appendClientParameters(context, buffer, parameters);
+      appendURLParameter(urlBuffer, extraKey, extraValue);
+    appendClientParameters(context, urlBuffer, parameters);
+    
+    String url = urlBuffer.toString();
+    FacesContext facesContext = context.getFacesContext();
+    if(facesContext != null)
+      url = facesContext.getExternalContext().encodeActionURL(url);
 
+    buffer.append(url);
     buffer.append(endScript);
     buffer.append(returnScript);
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Wed Dec  6 18:53:58 2006
@@ -19,6 +19,8 @@
 
 import javax.faces.component.UIComponent;
 
+import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
@@ -670,24 +672,6 @@
   }
 
 
-  /**
-   * encodes a given URL
-   * @param context the context from which to get the URLEncoder
-   * @param url the URL to encode. this must be a String object
-   * @return the encoded form of the URL, by calling the encodeURL method
-   *  in the URLEncoder
-   * @see UIXRenderingContext#getURLEncoder()
-   * @see org.apache.myfaces.trinidadinternal.share.url.URLEncoder#encodeURL(String)
-   */
-  protected static String encodeURL(
-          UIXRenderingContext context,
-          Object           url
-          )
-  {
-    return context.getURLEncoder().encodeURL((url != null)
-            ? url.toString()
-            : null);
-  }
 
   protected static String appendURLArgument(
           String baseURL,
@@ -716,18 +700,61 @@
     return BaseLafUtils.appendURLArguments( baseURL, keysAndValues);
   }
 
-  protected void renderEncodedURIAttribute(
-          UIXRenderingContext context,
-          String           name,
-          Object           value) throws IOException
+  protected String encodeActionURL(
+   UIXRenderingContext context,
+   Object       value) throws IOException
   {
     if (value != null)
     {
-      value = encodeURL(context, value);
-      context.getResponseWriter().writeURIAttribute(name, value, null);
+      FacesContext facesContext = context.getFacesContext();
+      if(facesContext != null)
+      {
+        return facesContext.getExternalContext().encodeActionURL(value.toString());
+      }
+      return value.toString();
+    }
+    return null;
+  }
+  
+  protected String encodeResourceURL(
+   UIXRenderingContext context,
+   Object       value) throws IOException
+  {
+    if (value != null)
+    {
+      FacesContext facesContext = context.getFacesContext();
+      if(facesContext != null)
+      {
+        return facesContext.getExternalContext().encodeResourceURL(value.toString());
+      }
+      return value.toString();
+    }
+    return null;
+  }  
+  
+  protected void renderEncodedActionURI(
+   UIXRenderingContext context,
+   String       name,
+   Object       value) throws IOException
+  {
+    if (value != null)
+    {
+      String encodedURL = encodeActionURL(context, value);
+      context.getResponseWriter().writeURIAttribute(name, encodedURL, null);
     }
   }
 
+  protected void renderEncodedResourceURI(
+   UIXRenderingContext context,
+   String       name,
+   Object       value) throws IOException
+  {
+    if (value != null)
+    {
+      String encodedURL = encodeResourceURL(context, value);
+      context.getResponseWriter().writeURIAttribute(name, encodedURL, null);
+    }
+  }
 
   /**
    * Returns the Agent capability specified by the key

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java Wed Dec  6 18:53:58 2006
@@ -643,7 +643,7 @@
 
         if (isLink)
         {
-           renderEncodedURIAttribute(context, "href", destination);
+           renderEncodedActionURI(context, "href", destination);
            renderAttribute(context, node, "target", TARGET_FRAME_ATTR);
 
           // Don't render access key on Netscape... Netscape doesn't
@@ -699,4 +699,5 @@
     new AlternateRenderer();
 
 }
+
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Wed Dec  6 18:53:58 2006
@@ -126,7 +126,7 @@
     if (hasLink)
     {
       writer.startElement("a", component);
-      renderEncodedURIAttribute(context, "href", destination);
+      renderEncodedActionURI(context, "href", destination);
       renderAttribute(context, node, "target", TARGET_FRAME_ATTR);
 
       // Don't render access key on Netscape... Netscape doesn't

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java Wed Dec  6 18:53:58 2006
@@ -72,7 +72,7 @@
 
     if (isLink)
     {
-      renderEncodedURIAttribute(context, HREF_ATTRIBUTE, destination);
+      renderEncodedActionURI(context, HREF_ATTRIBUTE, destination);
       renderAttribute(context, node,
                       TARGET_FRAME_ATTRIBUTE, TARGET_FRAME_ATTR);
 
@@ -83,7 +83,7 @@
     {
       writer.startElement(IMAGE_ELEMENT, null);
       renderStyleClassAttribute(context, AF_MENU_BUTTONS_IMAGE_STYLE_CLASS);
-      renderURIAttribute(context, SOURCE_ATTRIBUTE, iconURI);
+      renderEncodedResourceURI(context, SOURCE_ATTRIBUTE, iconURI);
       renderAltAndTooltipForImage(context, shortDesc);
       renderAttribute(context, BORDER_ATTRIBUTE, 0);
       renderAttribute(context, node, WIDTH_ATTRIBUTE, WIDTH_ATTR);

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java Wed Dec  6 18:53:58 2006
@@ -233,7 +233,7 @@
         writer.startElement(IMAGE_ELEMENT, null);
         writer.writeAttribute(ALT_ATTRIBUTE, EMPTY_STRING_ATTRIBUTE_VALUE, null);   
         renderStyleClassAttribute(context, AF_PANEL_HEADER_ICON_STYLE_CLASS);
-        renderURIAttribute(context, SOURCE_ATTRIBUTE, iconURI);
+        renderEncodedResourceURI(context, SOURCE_ATTRIBUTE, iconURI);
         writer.endElement(IMAGE_ELEMENT);
       }
     }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Wed Dec  6 18:53:58 2006
@@ -223,9 +223,12 @@
       return;
 
     ResponseWriter writer = context.getResponseWriter();
-
-    writer.writeAttribute(attribute,
-                          LafIconProvider.getCacheImageURI(context) + uri,
+    String cachedImgURI = LafIconProvider.getCacheImageURI(context) + uri;
+    FacesContext facesContext = context.getFacesContext();
+    if(facesContext != null)
+      cachedImgURI = facesContext.getExternalContext().encodeResourceURL(cachedImgURI);
+    writer.writeURIAttribute(attribute,
+                          cachedImgURI,
 						  null);
   }
 }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java Wed Dec  6 18:53:58 2006
@@ -77,7 +77,7 @@
 
       Object destination = getDestination(context, node);
       if (destination != null)
-        renderEncodedURIAttribute(context, HREF_ATTRIBUTE, destination);
+        renderEncodedActionURI(context, HREF_ATTRIBUTE, destination);
     }
   }
 
@@ -93,7 +93,7 @@
     {
       ResponseWriter writer = context.getResponseWriter();
       writer.startElement("img", null);
-      writer.writeURIAttribute("src", source, null);
+      renderEncodedResourceURI(context, "src", source);
       writer.writeAttribute("border", "0", null);
       renderAltAndTooltipForImage(context, getShortDesc(context, node));
       writer.writeAttribute("align", getVAlign(context, node), null);

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java Wed Dec  6 18:53:58 2006
@@ -739,7 +739,7 @@
 
       // Convert iconURL to an absolute uri
       if (isIconAbsoluteURI)
-        renderURIAttribute(context, SOURCE_ATTRIBUTE, icon);
+        renderEncodedResourceURI(context, SOURCE_ATTRIBUTE, icon);
       else
         writeAbsoluteImageURI(context, SOURCE_ATTRIBUTE, icon);
         

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java Wed Dec  6 18:53:58 2006
@@ -147,7 +147,7 @@
         {
             writer.startElement(IMAGE_ELEMENT, null);
             writer.writeAttribute(ALT_ATTRIBUTE, EMPTY_STRING_ATTRIBUTE_VALUE, null);
-            renderURIAttribute(context, SOURCE_ATTRIBUTE, iconURI);
+            renderEncodedResourceURI(context, SOURCE_ATTRIBUTE, iconURI);
             writer.endElement(IMAGE_ELEMENT);
         }
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java Wed Dec  6 18:53:58 2006
@@ -19,6 +19,8 @@
 
 import javax.faces.component.UIComponent;
 
+import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -267,7 +269,11 @@
 
         if (destination != null)
         {
-          destination = encodeURL(context, destination);
+          String destinationBeforeEncode = destination;
+          FacesContext facesContext = context.getFacesContext();
+          if(facesContext != null)
+            destination = facesContext.getExternalContext().encodeActionURL(destination);
+
           Object targetFrame = getTargetFrame(context, node);
 
           // if destination starts with "javascript:",
@@ -283,8 +289,8 @@
                         destination    +
                         "'";
           }
-          else if ( destination.length() < 11 ||
-                    !"javascript:".equalsIgnoreCase(destination.substring(0,11)))
+          else if ( destinationBeforeEncode.length() < 11 ||
+                    !"javascript:".equalsIgnoreCase(destinationBeforeEncode.substring(0,11)))
           {
             onClickJS = "document.location='" + destination + "'";
           }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java Wed Dec  6 18:53:58 2006
@@ -85,7 +85,7 @@
       
       if ( destination != null)
       {
-        value = '#' + encodeURL(context, destination);
+        value = '#' + encodeActionURL(context, destination);
       }
       else if ( value != null)
       {

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java Wed Dec  6 18:53:58 2006
@@ -181,7 +181,7 @@
   {
     Object source = _getLocalSource(context, node);
 
-    renderURIAttribute(context, SOURCE_ATTRIBUTE, source);
+    renderEncodedResourceURI(context, SOURCE_ATTRIBUTE, source);
     renderAltAndTooltipForImage(context, getShortDesc(context, node));
     renderAttribute(context, node, WIDTH_ATTRIBUTE,  WIDTH_ATTR);
     renderAttribute(context, node, HEIGHT_ATTRIBUTE, HEIGHT_ATTR);
@@ -274,7 +274,7 @@
 
     if (hasLink)
     {
-      renderEncodedURIAttribute(context, HREF_ATTRIBUTE, destination);
+      renderEncodedActionURI(context, HREF_ATTRIBUTE, destination);
 
       if (supportsAccessKeys(context))
       {

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Wed Dec  6 18:53:58 2006
@@ -195,7 +195,7 @@
       if (!isJavascript ||
           supportsScripting(context))
       {
-        renderEncodedURIAttribute(context, "href", destination);
+        renderEncodedActionURI(context, "href", destination);
       }
     }
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Wed Dec  6 18:53:58 2006
@@ -511,7 +511,8 @@
         // First, non-formSubmitted mode.
         if (formName == null)
         {
-          onChange = _getChoiceOnChange(_getDestinationString(context, navBar),
+          onChange = _getChoiceOnChange(context,
+                                        _getDestinationString(context, navBar),
                                         sourceKey,
                                         eventKey,
                                         name,
@@ -562,6 +563,7 @@
   }
 
   private String _getChoiceOnChange(
+    UIXRenderingContext context,
     String destination,
     String sourceKey,
     String eventKey,
@@ -605,13 +607,20 @@
       startScript = _CHOICE_ON_CHANGE_START;
       endScript = _CHOICE_ON_CHANGE_END;
     }
-
-    StringBuffer buffer = new StringBuffer(initialSize          +
-                                           startScript.length() +
-                                           endScript.length());
+    
+    int bufferlength = initialSize + startScript.length() + endScript.length();
+    StringBuffer buffer = new StringBuffer(bufferlength);
+    StringBuffer urlBuffer = new StringBuffer(initialSize);
 
     buffer.append(startScript);
-    appendURLArguments(buffer, destination, keysAndValues);
+    
+    appendURLArguments(urlBuffer, destination, keysAndValues);
+    String url = urlBuffer.toString();
+    FacesContext facesContext = context.getFacesContext();
+    if(facesContext != null)
+      url = facesContext.getExternalContext().encodeActionURL(url);
+    
+    buffer.append(url);
     buffer.append(endScript);
 
     return buffer.toString();
@@ -1336,7 +1345,8 @@
         int count = choice.getIndexedChildCount(context);
         if (count > 1)
         {
-          onChange = _getChoiceOnChange(destination,
+          onChange = _getChoiceOnChange(context, 
+                                        destination,
                                         sourceKey,
                                         eventKey,
                                         name,

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java Wed Dec  6 18:53:58 2006
@@ -72,7 +72,7 @@
       }
 
       writer.writeAttribute("language", "javascript", null);
-      writer.writeURIAttribute("src", source, null);
+      renderEncodedResourceURI(context, "src", source);
       _renderDeferAttribute(context, node);
       // Bug #3426092:
       // render the type="text/javascript" attribute in accessibility mode

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Wed Dec  6 18:53:58 2006
@@ -19,6 +19,8 @@
 import java.util.Iterator;
 
 import javax.faces.component.UIComponent;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 import javax.faces.validator.Validator;
@@ -467,7 +469,7 @@
   {
     return true;
   }
-
+  
   public static void renderStyleAndClass(
     UIXRenderingContext context,
     String           inlineStyle,
@@ -1431,7 +1433,7 @@
         if (supportsNavigation(context))
         {
           writer.startElement("a", null);
-          renderEncodedURIAttribute(context, HREF_ATTRIBUTE, destination);
+          renderEncodedActionURI(context, HREF_ATTRIBUTE, destination);
           writer.writeAttribute("onclick", onClick, null);
           writer.writeAttribute("target", targetFrame, null);
 
@@ -1458,7 +1460,7 @@
       // get the correct alignment to use for the agent
       writer.writeAttribute("align", imgAlign, null);
 
-      writer.writeAttribute("src", iconAbsoluteURI, null);
+      renderEncodedResourceURI(context, "src", iconAbsoluteURI);
       writer.writeAttribute("border", "0", null);
       if (isBlock)
       {
@@ -1504,9 +1506,11 @@
 
     ResponseWriter writer = context.getResponseWriter();
 
-    writer.writeAttribute(attribute,
-                          getBaseImageURI(context) + uri,
-                                                  null);
+    String encodedUri = getBaseImageURI(context) + uri;
+    FacesContext facesContext = context.getFacesContext();
+    if (facesContext != null)
+      encodedUri = facesContext.getExternalContext().encodeResourceURL(encodedUri);
+    writer.writeURIAttribute(attribute, encodedUri, null);
   }
 
 

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java?view=diff&rev=483330&r1=483329&r2=483330
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java (original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java Wed Dec  6 18:53:58 2006
@@ -723,7 +723,10 @@
       RenderingContext arc = RenderingContext.getCurrentInstance();
       if (!Boolean.FALSE.equals(arc.getAgent().getCapabilities().get(
                TrinidadAgent.CAP_NAVIGATION)))
+      {  
+        href = context.getExternalContext().encodeActionURL(href);
         context.getResponseWriter().writeURIAttribute("href", href, null);
+      }
     }
 
     @Override



Mime
View raw message