incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r418880 [2/3] - in /incubator/adffaces/branches/matzew-mock-overhaul/adf-faces: adf-faces-api/src/main/java-templates/org/apache/myfaces/adf/component/ adf-faces-api/src/main/java/org/apache/myfaces/adf/component/ adf-faces-api/src/main/jav...
Date Tue, 04 Jul 2006 00:14:55 GMT
Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelBorder.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelBorder.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelBorder.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelBorder.xml Mon Jul  3 17:14:52 2006
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:af="http://myfaces.apache.org/adf/faces"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
@@ -32,7 +32,6 @@
     <facet>
       <description><![CDATA[Content to be rendered above the children.]]>
       </description>
-      <display-name>top</display-name>
       <facet-name>top</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -43,7 +42,6 @@
     <facet>
       <description><![CDATA[Content to be rendered below the children.]]>
       </description>
-      <display-name>bottom</display-name>
       <facet-name>bottom</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -55,7 +53,6 @@
       <description><![CDATA[Content to be rendered to the left of the children and
                 between any top and bottom children.]]>
       </description>
-      <display-name>left</display-name>
       <facet-name>left</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -65,7 +62,6 @@
       <description><![CDATA[Content to be rendered to the right of the children and
                 between any top and bottom children.]]>
       </description>
-      <display-name>right</display-name>
       <facet-name>right</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -76,7 +72,6 @@
                 between any top and bottom children, if the reading direction is
                 left-to-right, on the right otherwise.]]>
       </description>
-      <display-name>start</display-name>
       <facet-name>start</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -90,7 +85,6 @@
                 between any top and bottom children, if the reading direction is
                 left-to-right, on the left otherwise.]]>
       </description>
-      <display-name>end</display-name>
       <facet-name>end</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -144,4 +138,4 @@
       <mfp:uix2-local-name>borderLayout</mfp:uix2-local-name>
     </component-extension>
   </component>
-</faces-config>
+</faces-config>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelForm.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelForm.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelForm.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelForm.xml Mon Jul  3 17:14:52 2006
@@ -39,7 +39,6 @@
 This facet may not always line up perfectly, especially if the labels or fields are longer than expected.  Try adjusting things with the labelWidth and fieldWidth attributes when necessary.  Also, the columns attribute on inputText may be helpful.
              </p>]]>
       </description>
-      <display-name>footer</display-name>
       <facet-name>footer</facet-name>
       <facet-extension>
         <mfp:facet-metadata>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelGroup.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelGroup.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelGroup.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelGroup.xml Mon Jul  3 17:14:52 2006
@@ -29,7 +29,6 @@
     <facet>
       <description><![CDATA[Content to be rendered once between each of the
                 other children.]]></description>
-      <display-name>separator</display-name>
       <facet-name>separator</facet-name>
     </facet>
 

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelHorizontal.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelHorizontal.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelHorizontal.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelHorizontal.xml Mon Jul  3 17:14:52 2006
@@ -32,7 +32,6 @@
     <facet>
       <description><![CDATA[Content to be rendered once between each of the
                 other children.]]></description>
-      <display-name>separator</display-name>
       <facet-name>separator</facet-name>
     </facet>
     <property>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelLabelAndMessage.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelLabelAndMessage.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelLabelAndMessage.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelLabelAndMessage.xml Mon Jul  3 17:14:52 2006
@@ -29,7 +29,6 @@
 
     <facet>
       <description>This facet should contain field level help.</description>
-      <display-name>help</display-name>
       <facet-name>help</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -39,7 +38,6 @@
     </facet>
     <facet>
       <description><![CDATA[Component to render after the children.]]></description>
-      <display-name>end</display-name>
       <facet-name>end</facet-name>
     </facet>
 

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPage.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPage.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPage.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPage.xml Mon Jul  3 17:14:52 2006
@@ -13,7 +13,6 @@
 
     <facet>
       <description><![CDATA[Area to put a commandLink to more information about the application.]]></description>
-      <display-name>appAbout</display-name>
       <facet-name>appAbout</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -26,7 +25,6 @@
       <description><![CDATA[The copyright region of the page.  If present, this area
                 typically contains an outputText with the copyright information.]]>
       </description>
-      <display-name>appCopyright</display-name>
       <facet-name>appCopyright</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -41,7 +39,6 @@
                 typically contains a commandLink to the privacy policy for the
                 application.]]>
       </description>
-      <display-name>appPrivacy</display-name>
       <facet-name>appPrivacy</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -52,7 +49,6 @@
     </facet>
     <facet>
       <description><![CDATA[The auxiliary content for the primary layer.]]></description>
-      <display-name>auxiliary1</display-name>
       <facet-name>auxiliary1</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -60,7 +56,6 @@
     </facet>
     <facet>
       <description><![CDATA[The auxiliary content for the secondary layer.]]></description>
-      <display-name>auxiliary2</display-name>
       <facet-name>auxiliary2</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -68,7 +63,6 @@
     </facet>
     <facet>
       <description><![CDATA[The auxiliary content for the global layer.]]></description>
-      <display-name>auxiliaryGlobal</display-name>
       <facet-name>auxiliaryGlobal</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -79,7 +73,6 @@
                 contains a horizontal panelGroup for an objectImage of a logo and an
                 outputText for a title.]]>
       </description>
-      <display-name>branding</display-name>
       <facet-name>branding</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -90,7 +83,6 @@
     </facet>
     <facet>
       <description><![CDATA[The global contextual region of the page.]]></description>
-      <display-name>contextGlobal</display-name>
       <facet-name>contextGlobal</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -98,7 +90,6 @@
     </facet>
     <facet>
       <description><![CDATA[An optional horizontally oriented region of contexual components for the main content.]]></description>
-      <display-name>contextLocal</display-name>
       <facet-name>contextLocal</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -108,7 +99,6 @@
       <description><![CDATA[The footnote information region.  This region provides a location for
                 page-level information that is ancillary to the user's task.]]>
       </description>
-      <display-name>infoFootnote</display-name>
       <facet-name>infoFootnote</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -120,7 +110,6 @@
     <facet>
       <description><![CDATA[The return information region. Typically this will contain a "return to [X]" link.]]>
       </description>
-      <display-name>infoReturn</display-name>
       <facet-name>infoReturn</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -134,7 +123,6 @@
                 provides a location for page-level status that is important to
                 the user's task.]]>
       </description>
-      <display-name>infoStatus</display-name>
       <facet-name>infoStatus</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -146,7 +134,6 @@
       <description><![CDATA[The user information region.  This region provides a location for
                 presenting user sign-in and connection information.]]>
       </description>
-      <display-name>infoUser</display-name>
       <facet-name>infoUser</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -162,7 +149,6 @@
                 links that will bring the user back to each of the parent
                 pages of a tree of pages that he has navigated down into.]]>
       </description>
-      <display-name>location</display-name>
       <facet-name>location</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -172,7 +158,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically contains tabs for the primary layer.]]></description>
-      <display-name>navigation1</display-name>
       <facet-name>navigation1</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -183,7 +168,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically contains tabs for the secondary layer.]]></description>
-      <display-name>navigation2</display-name>
       <facet-name>navigation2</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -193,7 +177,6 @@
     </facet>
     <facet>
       <description><![CDATA[An optional vertically oriented region of contexual components for the main content.  Often this contains a list or tree of links for deeper navigation structure than the global, primary, and secondary regions can provide.]]></description>
-      <display-name>navigation3</display-name>
       <facet-name>navigation3</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -204,7 +187,6 @@
     </facet>
     <facet>
       <description><![CDATA[This section typically contains global application links or otherwise top level navigation structure links, e.g. "Home", "Preferences", "Help", and "Sign Out".]]></description>
-      <display-name>navigationGlobal</display-name>
       <facet-name>navigationGlobal</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -215,7 +197,6 @@
     </facet>
     <facet>
       <description><![CDATA[The search region of the page.  Typically used for application or system-wide searches.]]></description>
-      <display-name>search</display-name>
       <facet-name>search</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -226,7 +207,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically is a toolbar for the primary layer.]]></description>
-      <display-name>toolbar1</display-name>
       <facet-name>toolbar1</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -234,7 +214,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically is a toolbar for the secondary layer.]]></description>
-      <display-name>toolbar2</display-name>
       <facet-name>toolbar2</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -242,7 +221,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically is a toolbar for the global layer.]]></description>
-      <display-name>toolbarGlobal</display-name>
       <facet-name>toolbarGlobal</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPageHeader.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPageHeader.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPageHeader.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelPageHeader.xml Mon Jul  3 17:14:52 2006
@@ -28,7 +28,6 @@
     <component-class>org.apache.myfaces.adf.component.core.layout.CorePanelPageHeader</component-class>
     <facet>
       <description><![CDATA[This location typically contains a menuTabs.]]></description>
-      <display-name>navigation1</display-name>
       <facet-name>navigation1</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -38,7 +37,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically contains a menuBar.]]></description>
-      <display-name>navigation2</display-name>
       <facet-name>navigation2</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -48,7 +46,6 @@
     </facet>
     <facet>
       <description><![CDATA[This section typically contains a menuButtons.]]></description>
-      <display-name>navigationGlobal</display-name>
       <facet-name>navigationGlobal</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -58,7 +55,6 @@
     </facet>
     <facet>
       <description><![CDATA[This location typically contains a menuChoice.]]></description>
-      <display-name>menuSwitch</display-name>
       <facet-name>menuSwitch</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -73,7 +69,6 @@
                 contains a medium size objectImage of the logo of the organization 
                 owning the page.]]>
       </description>
-      <display-name>branding</display-name>
       <facet-name>branding</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -85,7 +80,6 @@
       <description><![CDATA[The application, module, or product branding region of the page.
                 This section typically contains a objectImage of the application logo.]]>
       </description>
-      <display-name>brandingApp</display-name>
       <facet-name>brandingApp</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -101,7 +95,6 @@
                 then navigates into a tabbed application pertaining to that 
                 specific context.]]>
       </description>
-      <display-name>brandingAppContextual</display-name>
       <facet-name>brandingAppContextual</facet-name>
       <facet-extension>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
@@ -109,7 +102,6 @@
     </facet>
     <facet>
       <description><![CDATA[The search region of the page.]]></description>
-      <display-name>search</display-name>
       <facet-name>search</facet-name>
       <facet-extension>
         <mfp:facet-metadata>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelSideBar.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelSideBar.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelSideBar.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CorePanelSideBar.xml Mon Jul  3 17:14:52 2006
@@ -29,7 +29,6 @@
     <facet>
       <description><![CDATA[rendered above the children of the
                 panelSideBar.]]></description>
-      <display-name>filter</display-name>
       <facet-name>filter</facet-name>
     </facet>
     <property>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectManyShuttle.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectManyShuttle.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectManyShuttle.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectManyShuttle.xml Mon Jul  3 17:14:52 2006
@@ -31,7 +31,6 @@
     <component-class>org.apache.myfaces.adf.component.core.input.CoreSelectManyShuttle</component-class>
     <facet>
       <description><![CDATA[the filter above the leading list.]]></description>
-      <display-name>filter</display-name>
       <facet-name>filter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -41,7 +40,6 @@
     </facet>
     <facet>
       <description><![CDATA[the footer of buttons/images under the leading list.]]></description>
-      <display-name>leadingFooter</display-name>
       <facet-name>leadingFooter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -51,7 +49,6 @@
     </facet>
     <facet>
       <description><![CDATA[the footer of buttons/images under the trailing list.]]></description>
-      <display-name>trailingFooter</display-name>
       <facet-name>trailingFooter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectOrderShuttle.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectOrderShuttle.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectOrderShuttle.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreSelectOrderShuttle.xml Mon Jul  3 17:14:52 2006
@@ -31,7 +31,6 @@
     <component-class>org.apache.myfaces.adf.component.core.input.CoreSelectOrderShuttle</component-class>
     <facet>
       <description><![CDATA[the filter above the leading list.]]></description>
-      <display-name>filter</display-name>
       <facet-name>filter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -41,7 +40,6 @@
     </facet>
     <facet>
       <description><![CDATA[the footer of buttons/images under the leading list.]]></description>
-      <display-name>leadingFooter</display-name>
       <facet-name>leadingFooter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -51,7 +49,6 @@
     </facet>
     <facet>
       <description><![CDATA[the footer of buttons/images under the trailing list.]]></description>
-      <display-name>trailingFooter</display-name>
       <facet-name>trailingFooter</facet-name>
       <facet-extension>
         <mfp:facet-metadata>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreShowDetail.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreShowDetail.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreShowDetail.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreShowDetail.xml Mon Jul  3 17:14:52 2006
@@ -46,7 +46,6 @@
         <![CDATA[Component rendered next to the hide or show icon.  If this facet is present, this
 will be used instead of the disclosedText and undisclosedText attributes.]]>
       </description>
-      <display-name>prompt</display-name>
       <facet-name>prompt</facet-name>
       <facet-extension>
         <mfp:required>false</mfp:required>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreTreeTable.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreTreeTable.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreTreeTable.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/CoreTreeTable.xml Mon Jul  3 17:14:52 2006
@@ -36,7 +36,6 @@
       <description><![CDATA[the component used to stamp each step of the focus path of this 
                   treeTable.]]>
       </description>
-      <display-name>pathStamp</display-name>
       <facet-name>pathStamp</facet-name>
       <facet-extension>
         <mfp:long-description>the component used to stamp each step of the focus path of this 

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonFormControls.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonFormControls.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonFormControls.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonFormControls.xml Mon Jul  3 17:14:52 2006
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:af="http://myfaces.apache.org/adf/faces"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
@@ -21,7 +21,6 @@
   <component>
     <facet>
       <description>This facet should contain field level help.</description>
-      <display-name>help</display-name>
       <facet-name>help</facet-name>
       <facet-extension>
         <mfp:facet-metadata>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonTableAttrs.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonTableAttrs.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonTableAttrs.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/core/includes/CommonTableAttrs.xml Mon Jul  3 17:14:52 2006
@@ -6,7 +6,6 @@
   <component>
     <facet>
       <description><![CDATA[the component used to render the table footer.]]></description>
-      <display-name>footer</display-name>
       <facet-name>footer</facet-name>
       <facet-extension>
         <mfp:long-description>This component will be used to render the table footer.
@@ -17,7 +16,6 @@
     </facet>
     <facet>
       <description><![CDATA[the component used to render the table header.]]></description>
-      <display-name>header</display-name>
       <facet-name>header</facet-name>
       <facet-extension>
         <mfp:long-description>This component will be used to render the table header.</mfp:long-description>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/html/HtmlFrameBorderLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/html/HtmlFrameBorderLayout.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/html/HtmlFrameBorderLayout.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-build/src/main/resources/META-INF/maven-faces-plugin/components/adf/html/HtmlFrameBorderLayout.xml Mon Jul  3 17:14:52 2006
@@ -30,7 +30,6 @@
     <component-class>org.apache.myfaces.adf.component.html.HtmlFrameBorderLayout</component-class>
     <facet>
       <description><![CDATA[The frame to be rendered in the center.]]></description>
-      <display-name>center</display-name>
       <facet-name>center</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -44,7 +43,6 @@
                 This frame's height attribute is used to allocate
                 its height.]]>
       </description>
-      <display-name>top</display-name>
       <facet-name>top</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -58,7 +56,6 @@
                 This frame's height attribute is used to allocate
                 its height.]]>
       </description>
-      <display-name>bottom</display-name>
       <facet-name>bottom</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -72,7 +69,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>left</display-name>
       <facet-name>left</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -86,7 +82,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>right</display-name>
       <facet-name>right</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -102,7 +97,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>start</display-name>
       <facet-name>start</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -117,7 +111,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>end</display-name>
       <facet-name>end</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -131,7 +124,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>innerLeft</display-name>
       <facet-name>innerLeft</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -145,7 +137,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>innerRight</display-name>
       <facet-name>innerRight</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -160,7 +151,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>innerStart</display-name>
       <facet-name>innerStart</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -175,7 +165,6 @@
                 This frame's width attribute is used to allocate
                 its width.]]>
       </description>
-      <display-name>innerEnd</display-name>
       <facet-name>innerEnd</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
@@ -188,7 +177,6 @@
               <code>NOFRAMES</code> tags. Browsers that do not
               support frames will render these contents.]]>
       </description>
-      <display-name>alternateContent</display-name>
       <facet-name>alternateContent</facet-name>
     </facet>
     <property>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/adf-faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/adf-faces-config.xml?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/adf-faces-config.xml (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/adf-faces-config.xml Mon Jul  3 17:14:52 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,22 +14,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<adf-faces-config xmlns="http://myfaces.apache.org/adf/view/faces/config">
-  <debug-output>true</debug-output>
-  <!--client-validation-disabled>true</client-validation-disabled-->
-
-  <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>#{prefs.proxy.skinFamily}</skin-family>
-  <!--skin-family>oracle</skin-family-->
-
-  <!--  Uncomment any of these to enable them -->
-  <!-- accessibility-mode>inaccessible</accessibility-mode -->
-
-  <!-- A silly use of EL: English users get Simple Skin, others get Oracle Skin -->
-  <!-- skin-family>#{facesContext.viewRoot.locale.language=='en' ? 'simple' : 'oracle'}</skin-family -->
-
-  <!-- oracle-help-servlet-url>http://helponline.oracle.com/jdeveloper/help/</oracle-help-servlet-url -->
-  
-</adf-faces-config>
+<adf-faces-config xmlns="http://myfaces.apache.org/adf/view/faces/config">
+  <debug-output>true</debug-output>
+  <!--client-validation-disabled>true</client-validation-disabled-->
+
+  <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>#{prefs.proxy.skinFamily}</skin-family>
+
+  <!--  Uncomment any of these to enable them -->
+  <!-- accessibility-mode>inaccessible</accessibility-mode -->  
+</adf-faces-config>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/demos/panelPageSkinDemo.jspx?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/demos/panelPageSkinDemo.jspx (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/demos/panelPageSkinDemo.jspx Mon Jul  3 17:14:52 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,203 +14,202 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:h="http://java.sun.com/jsf/html"
-          xmlns:afh="http://myfaces.apache.org/adf/faces/html"
-          xmlns:af="http://myfaces.apache.org/adf/faces">
-  <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <f:view>
-    <afh:html>
-      <afh:head title="Skin Demo">
-        <!-- the beach skin is defined in beach.css. If you want to add your own
-     custom style classes, you can add it to beach.css or to your own css 
-     file, like what we demo here in beachCustomStyles.css -->
-        <link rel="stylesheet" charset="UTF-8" type="text/css"
-              href="/adf-faces-demo-context-root/skins/beach/CustomStyles.css"/>
-      </afh:head>
-      <afh:body>
-        <af:form>
-          <af:panelGroup layout="vertical">
-            <f:facet name="separator">
-              <af:objectSeparator/>
-            </f:facet>
-            <af:commandLink immediate="true" text="Component Guide"
-                            action="guide"/>
-            <af:panelGroup layout="vertical">
-              <af:panelGroup layout="horizontal" styleClass="tabsPanelGroup">
-                <af:menuTabs shortDesc="Select tab">
-                  <af:commandNavigationItem text="Home" action="guide.menuTabs"
-                                      selected="true"/>
-                  <af:commandNavigationItem text="Clothing" action="guide.menuTabs"/>
-                  <af:commandNavigationItem text="Equipment" action="guide.menuTabs"/>
-                </af:menuTabs>
-                <af:menuButtons>
-                  <af:commandNavigationItem text="Your Account"
-                                      action="guide.menuButtons"/>
-                  <af:outputText value="|"/>
-                  <af:objectIcon name="required"/>
-                  <af:commandNavigationItem text="SALES!" action="guide.menuButtons"/>
-                  <af:objectIcon name="required"/>
-                  <af:outputText value="|"/>
-                  <af:commandNavigationItem text="Help" action="guide.menuButtons"/>
-                </af:menuButtons>
-              </af:panelGroup>
-              <af:menuBar>
-                <af:commandNavigationItem text="Jackets" action="guide.menuBar"
-                                    selected="true"/>
-                <af:commandNavigationItem text="Pants" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Shirts" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Shoes" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Swimwear" action="guide.menuBar"/>
-                <af:commandNavigationItem text="Sale Items" action="guide.menuBar"/>
-              </af:menuBar>
-              <af:panelGroup layout="horizontal"
-                             styleClass="adfFacesDemoSearchPanelGroup">
-                <f:facet name="separator">
-                  <af:objectSpacer width="10px"/>
-                </f:facet>
-                <af:selectOneChoice label="Search">
-                  <af:selectItem label="Cycling"/>
-                  <af:selectItem label="Climbing"/>
-                </af:selectOneChoice>
-                <af:selectOneChoice label="Skin-family:" autoSubmit="false"
-                                    value="#{sessionScope.skinFamily}">
-                  <af:selectItem label="oracle" value="oracle"/>
-                  <af:selectItem label="simple" value="simple"/>
-                  <af:selectItem label="minimal" value="minimal"/>
-                  <af:selectItem label="purple" value="purple"/>
-                  <af:selectItem label="beach" value="beach"/>
-                </af:selectOneChoice>
-                <af:commandButton text="Go"/>
-              </af:panelGroup>
-              <af:panelGroup layout="horizontal" styleClass="welcomePanel">
-                <af:outputFormatted styleUsage="instruction"
-                                    value="&lt;b>Welcome!&lt;/b> We hope you find something you like."></af:outputFormatted>
-              </af:panelGroup>
-              <af:panelHorizontal valign="top" inlineStyle="padding:5px;">
-                <af:panelBox background="medium" text="Browse" inlineStyle="width:160px">
-                  <af:outputText value="Recent Purchases"
-                                 styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="flip flops"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="sandals"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="trail shoes"
-                               destination="http://www.oracle.com"/>
-                  </af:panelList>
-                  <af:outputText value="Equipment" styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="Cycling"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="Climbing"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="Kayaking"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="Camping"
-                               destination="http://www.oracle.com"/>
-                  </af:panelList>
-                  <af:outputText value="Clothing" styleClass="panelBoxHeader"/>
-                  <af:panelList>
-                    <af:goLink text="Shirts"
-                               destination="http://www.oracle.com"/>
-                    <af:goLink text="Shoes"
-                               destination="http://www.oracle.com"/>
-                  </af:panelList>
-                </af:panelBox>
-                <af:panelGroup layout="vertical">
-                  <af:panelHeader text="Recommendations for you">
-                    <af:outputText value="Everything in Camping  is on sale! Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
-                                   styleClass="mainContentText"/>
-                  </af:panelHeader>
-                  <af:objectSpacer height="5px"/>
-                  <af:panelHeader text="New in Down Jackets!">
-                    <af:outputText value="You might be sweltering in 100 degree heat, but think ahead to the cold winters and buy                     a down jacket!"
-                                   styleClass="mainContentText"/>
-                  </af:panelHeader>
-                  <af:objectSpacer height="15px"/>
-                  <af:showOneTab>
-                    <af:showDetailItem text="Tab 1">
-                      <af:panelHeader text="Tab Header 1">
-                        <af:panelForm>
-                          <af:inputText readOnly="true" label="Label 2-1"
-                                        value="Value" styleClass="AFDataText"/>
-                          <af:inputText readOnly="true"
-                                        label="Date/Time from last partial refresh"
-                                        value="#{date.currentDate}"
-                                        styleClass="AFDataText">
-                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
-                          </af:inputText>
-                          <af:selectInputDate label="Birthdate:"/>
-                        </af:panelForm>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                    <af:showDetailItem text="Tab 2" disclosed="true">
-                      <af:panelHeader text="ShowOneTab details">
-                        <af:outputText value="Everything in Camping  is on sale!  Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
-                                       styleClass="mainContentText"/>
-                        <af:panelGroup layout="horizontal">
-                          <af:goButton text="Sorry, Disabled" disabled="true"/>
-                          <af:objectSpacer width="10px"/>
-                          <af:goButton text="Go!" disabled="false"/>
-                        </af:panelGroup>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                    <af:showDetailItem text="Tab 4" disabled="true"/>
-                    <af:showDetailItem text="Tab 5">
-                      <af:panelHeader text="Header 5">
-                        <af:panelForm>
-                          <af:inputText readOnly="true" label="Label 5-1"
-                                        value="Value" styleClass="AFDataText"/>
-                          <af:inputText readOnly="true"
-                                        label="Date/Time from last partial refresh"
-                                        value="#{date.currentDate}"
-                                        styleClass="AFDataText">
-                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
-                          </af:inputText>
-                        </af:panelForm>
-                      </af:panelHeader>
-                    </af:showDetailItem>
-                  </af:showOneTab>
-                </af:panelGroup>
-                <af:panelGroup layout="vertical">
-                  <f:facet name="separator">
-                    <af:objectSpacer height="10px"/>
-                  </f:facet>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="New Releases"
-                                     styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
-                                          value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="More Stuff"
-                                     styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
-                                          value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                  <af:panelBox background="medium" inlineStyle="width:160px">
-                    <af:panelGroup layout="vertical">
-                      <af:outputText value="Your New Releases"
-                                     styleClass="panelBoxHeader"/>
-                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
-                      <af:outputFormatted styleUsage="instruction"
-                                          value="Check this out!"/>
-                    </af:panelGroup>
-                  </af:panelBox>
-                </af:panelGroup>
-              </af:panelHorizontal>
-            </af:panelGroup>
-          </af:panelGroup>
-        </af:form>
-      </afh:body>
-    </afh:html>
-  </f:view>
-</jsp:root>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:h="http://java.sun.com/jsf/html"
+          xmlns:afh="http://myfaces.apache.org/adf/faces/html"
+          xmlns:af="http://myfaces.apache.org/adf/faces">
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <afh:html>
+      <afh:head title="Skin Demo">
+        <!-- the beach skin is defined in beach.css. If you want to add your own
+     custom style classes, you can add it to beach.css or to your own css 
+     file, like what we demo here in beachCustomStyles.css -->
+        <link rel="stylesheet" charset="UTF-8" type="text/css"
+              href="/adf-faces-demo-context-root/skins/beach/CustomStyles.css"/>
+      </afh:head>
+      <afh:body>
+        <af:form>
+          <af:panelGroup layout="vertical">
+            <f:facet name="separator">
+              <af:objectSeparator/>
+            </f:facet>
+            <af:commandLink immediate="true" text="Component Guide"
+                            action="guide"/>
+            <af:panelGroup layout="vertical">
+              <af:panelGroup layout="horizontal" styleClass="tabsPanelGroup">
+                <af:menuTabs shortDesc="Select tab">
+                  <af:commandNavigationItem text="Home" action="guide.menuTabs"
+                                      selected="true"/>
+                  <af:commandNavigationItem text="Clothing" action="guide.menuTabs"/>
+                  <af:commandNavigationItem text="Equipment" action="guide.menuTabs"/>
+                </af:menuTabs>
+                <af:menuButtons>
+                  <af:commandNavigationItem text="Your Account"
+                                      action="guide.menuButtons"/>
+                  <af:outputText value="|"/>
+                  <af:objectIcon name="required"/>
+                  <af:commandNavigationItem text="SALES!" action="guide.menuButtons"/>
+                  <af:objectIcon name="required"/>
+                  <af:outputText value="|"/>
+                  <af:commandNavigationItem text="Help" action="guide.menuButtons"/>
+                </af:menuButtons>
+              </af:panelGroup>
+              <af:menuBar>
+                <af:commandNavigationItem text="Jackets" action="guide.menuBar"
+                                    selected="true"/>
+                <af:commandNavigationItem text="Pants" action="guide.menuBar"/>
+                <af:commandNavigationItem text="Shirts" action="guide.menuBar"/>
+                <af:commandNavigationItem text="Shoes" action="guide.menuBar"/>
+                <af:commandNavigationItem text="Swimwear" action="guide.menuBar"/>
+                <af:commandNavigationItem text="Sale Items" action="guide.menuBar"/>
+              </af:menuBar>
+              <af:panelGroup layout="horizontal"
+                             styleClass="adfFacesDemoSearchPanelGroup">
+                <f:facet name="separator">
+                  <af:objectSpacer width="10px"/>
+                </f:facet>
+                <af:selectOneChoice label="Search">
+                  <af:selectItem label="Cycling"/>
+                  <af:selectItem label="Climbing"/>
+                </af:selectOneChoice>
+                <af:selectOneChoice label="Skin-family:" autoSubmit="false"
+                                    value="#{sessionScope.skinFamily}">
+                  <af:selectItem label="simple" value="simple"/>
+                  <af:selectItem label="minimal" value="minimal"/>
+                  <af:selectItem label="purple" value="purple"/>
+                  <af:selectItem label="beach" value="beach"/>
+                </af:selectOneChoice>
+                <af:commandButton text="Go"/>
+              </af:panelGroup>
+              <af:panelGroup layout="horizontal" styleClass="welcomePanel">
+                <af:outputFormatted styleUsage="instruction"
+                                    value="&lt;b>Welcome!&lt;/b> We hope you find something you like."></af:outputFormatted>
+              </af:panelGroup>
+              <af:panelHorizontal valign="top" inlineStyle="padding:5px;">
+                <af:panelBox background="medium" text="Browse" inlineStyle="width:160px">
+                  <af:outputText value="Recent Purchases"
+                                 styleClass="panelBoxHeader"/>
+                  <af:panelList>
+                    <af:goLink text="flip flops"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="sandals"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="trail shoes"
+                               destination="http://www.oracle.com"/>
+                  </af:panelList>
+                  <af:outputText value="Equipment" styleClass="panelBoxHeader"/>
+                  <af:panelList>
+                    <af:goLink text="Cycling"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="Climbing"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="Kayaking"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="Camping"
+                               destination="http://www.oracle.com"/>
+                  </af:panelList>
+                  <af:outputText value="Clothing" styleClass="panelBoxHeader"/>
+                  <af:panelList>
+                    <af:goLink text="Shirts"
+                               destination="http://www.oracle.com"/>
+                    <af:goLink text="Shoes"
+                               destination="http://www.oracle.com"/>
+                  </af:panelList>
+                </af:panelBox>
+                <af:panelGroup layout="vertical">
+                  <af:panelHeader text="Recommendations for you">
+                    <af:outputText value="Everything in Camping  is on sale! Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
+                                   styleClass="mainContentText"/>
+                  </af:panelHeader>
+                  <af:objectSpacer height="5px"/>
+                  <af:panelHeader text="New in Down Jackets!">
+                    <af:outputText value="You might be sweltering in 100 degree heat, but think ahead to the cold winters and buy                     a down jacket!"
+                                   styleClass="mainContentText"/>
+                  </af:panelHeader>
+                  <af:objectSpacer height="15px"/>
+                  <af:showOneTab>
+                    <af:showDetailItem text="Tab 1">
+                      <af:panelHeader text="Tab Header 1">
+                        <af:panelForm>
+                          <af:inputText readOnly="true" label="Label 2-1"
+                                        value="Value" styleClass="AFDataText"/>
+                          <af:inputText readOnly="true"
+                                        label="Date/Time from last partial refresh"
+                                        value="#{date.currentDate}"
+                                        styleClass="AFDataText">
+                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
+                          </af:inputText>
+                          <af:selectInputDate label="Birthdate:"/>
+                        </af:panelForm>
+                      </af:panelHeader>
+                    </af:showDetailItem>
+                    <af:showDetailItem text="Tab 2" disclosed="true">
+                      <af:panelHeader text="ShowOneTab details">
+                        <af:outputText value="Everything in Camping  is on sale!  Enjoy huge savings on our most popular tents                     and sleeping bags. We even have dried food and mattresses"
+                                       styleClass="mainContentText"/>
+                        <af:panelGroup layout="horizontal">
+                          <af:goButton text="Sorry, Disabled" disabled="true"/>
+                          <af:objectSpacer width="10px"/>
+                          <af:goButton text="Go!" disabled="false"/>
+                        </af:panelGroup>
+                      </af:panelHeader>
+                    </af:showDetailItem>
+                    <af:showDetailItem text="Tab 4" disabled="true"/>
+                    <af:showDetailItem text="Tab 5">
+                      <af:panelHeader text="Header 5">
+                        <af:panelForm>
+                          <af:inputText readOnly="true" label="Label 5-1"
+                                        value="Value" styleClass="AFDataText"/>
+                          <af:inputText readOnly="true"
+                                        label="Date/Time from last partial refresh"
+                                        value="#{date.currentDate}"
+                                        styleClass="AFDataText">
+                            <af:convertDateTime pattern="EEEEEEEEE, ddMMMyyyy, HH:mm:ss z"/>
+                          </af:inputText>
+                        </af:panelForm>
+                      </af:panelHeader>
+                    </af:showDetailItem>
+                  </af:showOneTab>
+                </af:panelGroup>
+                <af:panelGroup layout="vertical">
+                  <f:facet name="separator">
+                    <af:objectSpacer height="10px"/>
+                  </f:facet>
+                  <af:panelBox background="medium" inlineStyle="width:160px">
+                    <af:panelGroup layout="vertical">
+                      <af:outputText value="New Releases"
+                                     styleClass="panelBoxHeader"/>
+                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <af:outputFormatted styleUsage="instruction"
+                                          value="Check this out!"/>
+                    </af:panelGroup>
+                  </af:panelBox>
+                  <af:panelBox background="medium" inlineStyle="width:160px">
+                    <af:panelGroup layout="vertical">
+                      <af:outputText value="More Stuff"
+                                     styleClass="panelBoxHeader"/>
+                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <af:outputFormatted styleUsage="instruction"
+                                          value="Check this out!"/>
+                    </af:panelGroup>
+                  </af:panelBox>
+                  <af:panelBox background="medium" inlineStyle="width:160px">
+                    <af:panelGroup layout="vertical">
+                      <af:outputText value="Your New Releases"
+                                     styleClass="panelBoxHeader"/>
+                      <af:objectImage source="/skins/beach/images/otn_logo_small.gif"/>
+                      <af:outputFormatted styleUsage="instruction"
+                                          value="Check this out!"/>
+                    </af:panelGroup>
+                  </af:panelBox>
+                </af:panelGroup>
+              </af:panelHorizontal>
+            </af:panelGroup>
+          </af:panelGroup>
+        </af:form>
+      </afh:body>
+    </afh:html>
+  </f:view>
+</jsp:root>

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/skins/purple/purpleSkin.css
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/skins/purple/purpleSkin.css?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/skins/purple/purpleSkin.css (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-demo/src/main/webapp/skins/purple/purpleSkin.css Mon Jul  3 17:14:52 2006
@@ -14,6 +14,8 @@
 * limitations under the License.
 */
 
+
+
 /** Change the colors to purple **/
 
 /** All these styles/icons/properties are overrides of the simple skin */
@@ -99,7 +101,7 @@
 }
 
 af|showOneTab::separator {
-  margin-width:4px;
+  margin:4px;
   border-top: #BB95BB; solid 4pt ;
   border-bottom: #BB95BB; solid 4pt ;
   BACKGROUND-COLOR: white;
@@ -350,19 +352,6 @@
    font-size:larger;
 }
 
-/** selectInputDate launch icon **/
-af|selectInputDate::launch-icon
-{
-  content:url(/skins/purple/images/dateButtonPurple.gif); 
-  width:19px; 
-  height:24px
-}
-af|selectInputDate::launch-icon:rtl
-{
-  content:url(/skins/purple/images/dateButtonPurpleRTL.gif); 
-  width:19px; 
-  height:24px
-}
 
 /** processTrain **/
 /** ------------ **/
@@ -400,6 +389,20 @@
   content:url(/skins/purple/images/checkdc.gif);
 }
 
+/** selectInputDate launch icon **/
+af|selectInputDate::launch-icon
+{
+  content:url(/skins/purple/images/dateButtonPurple.gif); 
+  width:19px; 
+  height:24px
+}
+af|selectInputDate::launch-icon:rtl
+{
+  content:url(/skins/purple/images/dateButtonPurpleRTL.gif); 
+  width:19px; 
+  height:24px
+}
+
 /* use special properties to change the ui **/
 /* don't show the last item in navigationPath (the default is to show it)*/
 
@@ -525,4 +528,41 @@
 af|inputText::label:rtl
 {
   font-weight:bold;
+}
+
+/* test @agent and @platform styles */
+/* right now @agent/@platform work with style selectors, but they have no
+   effect on icon selectors. */
+/* possible values for @agent are: 
+netscape, ie, mozilla, gecko, webkit, ice */
+/* possible values for @platform are: 
+windows, macos, linux, solaris, ppc */
+
+@agent ie
+{
+  af|panelBox::header
+  {
+    text-overflow: ellipsis;
+  }
+
+  .DropShadowStyle
+  {
+    width: 357; 
+    height: 50; 
+    font-size: 36pt; 
+    font-family: Arial Black; 
+    color: blue; 
+    Filter: DropShadow(Color=#FF0000, OffX=2, OffY=2, Positive=1); 
+    
+  }
+}
+
+
+@platform windows, linux, solaris
+{
+  /** for ie and gecko on windows, linux and solaris, make the color pink **/
+  @agent ie, gecko
+  {
+    af|inputText::content {background-color:pink}
+  }
 }

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/agent/AdfFacesAgentImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/agent/AdfFacesAgentImpl.java?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/agent/AdfFacesAgentImpl.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/agent/AdfFacesAgentImpl.java Mon Jul  3 17:14:52 2006
@@ -25,7 +25,7 @@
 
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.adfinternal.util.ClassLoaderUtils;
+import org.apache.myfaces.adf.util.ClassLoaderUtils;
 
 /**
  * implementation that supports the AdfFacesAgent

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/Structure.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/Structure.java?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/Structure.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/Structure.java Mon Jul  3 17:14:52 2006
@@ -28,7 +28,7 @@
 import javax.faces.component.UIComponent;
 
 import org.apache.myfaces.adf.component.UIXComponentBase;
-import org.apache.myfaces.adfinternal.util.ClassLoaderUtils;
+import org.apache.myfaces.adf.util.ClassLoaderUtils;
 
 /**
  * Utility class for storing the structure of a UIComponent tree.

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextFactoryImpl.java?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextFactoryImpl.java Mon Jul  3 17:14:52 2006
@@ -24,7 +24,8 @@
 import org.apache.myfaces.adf.context.PageFlowScopeProvider;
 import org.apache.myfaces.adf.context.PageResolver;
 
-import org.apache.myfaces.adfinternal.util.ClassLoaderUtils;
+import org.apache.myfaces.adf.util.ClassLoaderUtils;
+
 import org.apache.myfaces.adfinternal.webapp.ConfigParser;
 
 /**

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java Mon Jul  3 17:14:52 2006
@@ -40,6 +40,7 @@
 import org.apache.myfaces.adf.context.Agent;
 import org.apache.myfaces.adf.context.PageResolver;
 import org.apache.myfaces.adf.context.PageFlowScopeProvider;
+import org.apache.myfaces.adf.util.ClassLoaderUtils;
 import org.apache.myfaces.adf.webapp.UploadedFileProcessor;
 
 import org.apache.myfaces.adfinternal.agent.AdfFacesAgentImpl;
@@ -60,7 +61,6 @@
 import org.apache.myfaces.adfinternal.share.config.UIXCookie;
 
 import org.apache.myfaces.adfinternal.ui.expl.ColorPaletteUtils;
-import org.apache.myfaces.adfinternal.util.ClassLoaderUtils;
 import org.apache.myfaces.adfinternal.util.nls.LocaleUtils;
 
 import org.apache.myfaces.adfinternal.webapp.AdfFacesFilterImpl;

Modified: incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/ExternalContextDecorator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/ExternalContextDecorator.java?rev=418880&r1=418879&r2=418880&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/ExternalContextDecorator.java (original)
+++ incubator/adffaces/branches/matzew-mock-overhaul/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/ExternalContextDecorator.java Mon Jul  3 17:14:52 2006
@@ -13,201 +13,201 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfinternal.context;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.Principal;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-import java.util.Map;
-
-import javax.faces.context.ExternalContext;
-
-
-/**
- * Base class for decorating ExternalContexts.
- *
- * @author The Oracle ADF Faces Team
- */
-abstract class ExternalContextDecorator extends ExternalContext
-{
-  public void dispatch(String path) throws IOException
-  {
-    getExternalContext().dispatch(path);
-  }
-
-
-  public Object getContext()
-  { 
-    return getExternalContext().getContext();
-  }
-  
-  public Object getRequest()
-  {
-    return getExternalContext().getRequest(); 
-  }
-  
-  public Object getResponse()
-  {
-    return getExternalContext().getResponse();
-  }
-  
-  public Object getSession(boolean create)
-  {
-    return getExternalContext().getSession(create);
-  }
-  
-  public String getRequestContextPath()
-  {
-    return getExternalContext().getRequestContextPath();
-  }
-
-  public String getRequestPathInfo()
-  {
-    return getExternalContext().getRequestPathInfo();
-  }
-
-  public String getRequestServletPath()
-  {
-    return getExternalContext().getRequestServletPath();
-  }
-
-  public String getInitParameter(String name)
-  {
-    return getExternalContext().getInitParameter(name);
-  }
-  
-  public String encodeResourceURL(String url)
-  {
-    return getExternalContext().encodeResourceURL(url);
-  }
-
-  public String encodeActionURL(String url)
-  {
-    return getExternalContext().encodeActionURL(url);
-  }
-
-  public String encodeNamespace(String ns)
-  {
-    return getExternalContext().encodeNamespace(ns);
-  }
-
-  public String getAuthType()
-  {
-    return getExternalContext().getAuthType();
-  }
-
-  public String getRemoteUser()
-  {
-    return getExternalContext().getRemoteUser();
-  }
-
-  public Principal getUserPrincipal()
-  {
-    return getExternalContext().getUserPrincipal();
-  }
-
-  public boolean isUserInRole(String role)
-  {
-    return getExternalContext().isUserInRole(role);
-  }
-
-  public URL getResource(String path) throws MalformedURLException
-  {
-    return getExternalContext().getResource(path);
-  }
-
-  public InputStream getResourceAsStream(String path)
-  {
-    return getExternalContext().getResourceAsStream(path);
-  }
-
-  public Set getResourcePaths(String path)
-  {
-    return getExternalContext().getResourcePaths(path);
-  }
-
-  public Map getRequestParameterMap()
-  {
-    return getExternalContext().getRequestParameterMap();
-  }
-
-  public Map getRequestParameterValuesMap()
-  {
-    return getExternalContext().getRequestParameterValuesMap();
-  }
-
-  public Iterator getRequestParameterNames()
-  {
-    return getExternalContext().getRequestParameterNames();
-  }
-
-  public Map getRequestCookieMap()
-  {
-    return getExternalContext().getRequestCookieMap();
-  }
-
-  public Map getRequestHeaderMap()
-  {
-    return getExternalContext().getRequestHeaderMap();
-  }
-
-  public Map getRequestHeaderValuesMap()
-  {
-    return getExternalContext().getRequestHeaderValuesMap();
-  }
-
-
-  public Map getInitParameterMap()
-  {
-    return getExternalContext().getInitParameterMap();
-  }
-
-  public Map getApplicationMap()
-  {
-    return getExternalContext().getApplicationMap();
-  }
-
-  public Map getSessionMap()
-  {
-    return getExternalContext().getSessionMap();
-  }
-
-  public Map getRequestMap()
-  {
-    return getExternalContext().getRequestMap();
-  }
-
-
-  public Locale getRequestLocale()
-  {
-    return getExternalContext().getRequestLocale();
-  }
-
-  public Iterator getRequestLocales()
-  {
-    return getExternalContext().getRequestLocales();
-  }
-
-
-  public void log(String message)
-  {
-    getExternalContext().log(message);
-  }
-
-  public void log(String message, Throwable t)
-  {
-    getExternalContext().log(message, t);
-  }
-
-  public void redirect(String url) throws IOException
-  {
-    getExternalContext().redirect(url);
-  }
-
-  abstract protected ExternalContext getExternalContext();
-}
+package org.apache.myfaces.adfinternal.context;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
+import java.util.Map;
+
+import javax.faces.context.ExternalContext;
+
+
+/**
+ * Base class for decorating ExternalContexts.
+ *
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class ExternalContextDecorator extends ExternalContext
+{
+  public void dispatch(String path) throws IOException
+  {
+    getExternalContext().dispatch(path);
+  }
+
+
+  public Object getContext()
+  { 
+    return getExternalContext().getContext();
+  }
+  
+  public Object getRequest()
+  {
+    return getExternalContext().getRequest(); 
+  }
+  
+  public Object getResponse()
+  {
+    return getExternalContext().getResponse();
+  }
+  
+  public Object getSession(boolean create)
+  {
+    return getExternalContext().getSession(create);
+  }
+  
+  public String getRequestContextPath()
+  {
+    return getExternalContext().getRequestContextPath();
+  }
+
+  public String getRequestPathInfo()
+  {
+    return getExternalContext().getRequestPathInfo();
+  }
+
+  public String getRequestServletPath()
+  {
+    return getExternalContext().getRequestServletPath();
+  }
+
+  public String getInitParameter(String name)
+  {
+    return getExternalContext().getInitParameter(name);
+  }
+  
+  public String encodeResourceURL(String url)
+  {
+    return getExternalContext().encodeResourceURL(url);
+  }
+
+  public String encodeActionURL(String url)
+  {
+    return getExternalContext().encodeActionURL(url);
+  }
+
+  public String encodeNamespace(String ns)
+  {
+    return getExternalContext().encodeNamespace(ns);
+  }
+
+  public String getAuthType()
+  {
+    return getExternalContext().getAuthType();
+  }
+
+  public String getRemoteUser()
+  {
+    return getExternalContext().getRemoteUser();
+  }
+
+  public Principal getUserPrincipal()
+  {
+    return getExternalContext().getUserPrincipal();
+  }
+
+  public boolean isUserInRole(String role)
+  {
+    return getExternalContext().isUserInRole(role);
+  }
+
+  public URL getResource(String path) throws MalformedURLException
+  {
+    return getExternalContext().getResource(path);
+  }
+
+  public InputStream getResourceAsStream(String path)
+  {
+    return getExternalContext().getResourceAsStream(path);
+  }
+
+  public Set getResourcePaths(String path)
+  {
+    return getExternalContext().getResourcePaths(path);
+  }
+
+  public Map getRequestParameterMap()
+  {
+    return getExternalContext().getRequestParameterMap();
+  }
+
+  public Map getRequestParameterValuesMap()
+  {
+    return getExternalContext().getRequestParameterValuesMap();
+  }
+
+  public Iterator getRequestParameterNames()
+  {
+    return getExternalContext().getRequestParameterNames();
+  }
+
+  public Map getRequestCookieMap()
+  {
+    return getExternalContext().getRequestCookieMap();
+  }
+
+  public Map getRequestHeaderMap()
+  {
+    return getExternalContext().getRequestHeaderMap();
+  }
+
+  public Map getRequestHeaderValuesMap()
+  {
+    return getExternalContext().getRequestHeaderValuesMap();
+  }
+
+
+  public Map getInitParameterMap()
+  {
+    return getExternalContext().getInitParameterMap();
+  }
+
+  public Map getApplicationMap()
+  {
+    return getExternalContext().getApplicationMap();
+  }
+
+  public Map getSessionMap()
+  {
+    return getExternalContext().getSessionMap();
+  }
+
+  public Map getRequestMap()
+  {
+    return getExternalContext().getRequestMap();
+  }
+
+
+  public Locale getRequestLocale()
+  {
+    return getExternalContext().getRequestLocale();
+  }
+
+  public Iterator getRequestLocales()
+  {
+    return getExternalContext().getRequestLocales();
+  }
+
+
+  public void log(String message)
+  {
+    getExternalContext().log(message);
+  }
+
+  public void log(String message, Throwable t)
+  {
+    getExternalContext().log(message, t);
+  }
+
+  public void redirect(String url) throws IOException
+  {
+    getExternalContext().redirect(url);
+  }
+
+  abstract protected ExternalContext getExternalContext();
+}



Mime
View raw message