incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r426207 - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/ tri...
Date Thu, 27 Jul 2006 19:31:58 GMT
Author: matzew
Date: Thu Jul 27 12:31:57 2006
New Revision: 426207

URL: http://svn.apache.org/viewvc?rev=426207&view=rev
Log:
some more renaming... adfFacesContext => requestContext; tld from demo, ...

Modified:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/survey.tld
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/uixdemo.tld
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/chooseColor.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/WEB-INF/web.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/el.jspx
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/conf/base-faces-config.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
Thu Jul 27 12:31:57 2006
@@ -48,11 +48,11 @@
 abstract public class RequestContext
 {
   /**
-   * Name of the EL implicit variable ("adfFacesContext") that is used to
+   * Name of the EL implicit variable ("requestContext") that is used to
    * expose this context object.
    */
   static public final String VARIABLE_NAME =
-    "adfFacesContext";
+    "requestContext";
 
   // Omitted APIs:
   //

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
Thu Jul 27 12:31:57 2006
@@ -224,7 +224,7 @@
           <html:p>
           In order to simplify the use of standard palettes, ADF Faces makes 
           certain palettes available via the uix.colorPalette EL implicit 
-          object.  The &quot;#{adfFacesContext.colorPalette}&quot; implicit object
+          object.  The &quot;#{requestContext.colorPalette}&quot; implicit object
           provides access to four standard color palettes:
           <html:ul>
           <html:li><html:code>&quot;default49&quot;</html:code>:
49 colors, including
@@ -241,16 +241,16 @@
       <mfp:example>
         <mfp:source-code><![CDATA[<!-- A chooseColor which uses the standard
"default49" palette -->
 <af:chooseColor id="cc0"
-                colorData="#{adfFacesContext.colorPalette.default49}"/>
+                colorData="#{requestContext.colorPalette.default49}"/>
 
 <!-- A chooseColor which defines custom colors using inline data -->
-<af:chooseColor id="cc1" colorData="#{adfFacesContext.colorPalette.default49}"
+<af:chooseColor id="cc1" colorData="#{requestContext.colorPalette.default49}"
                          customColorData="#{myBean.listOfColors}">
 
 <!-- A chooseColor that is associated with a selectInputColor -->
 <af:selectInputColor id="sic1" chooseId="cc2"/>
 <af:chooseColor id="cc2" width="18"
-                colorData="#{adfFacesContext.colorPalette.web216}"/>]]>
+                colorData="#{requestContext.colorPalette.web216}"/>]]>
         </mfp:source-code>
       </mfp:example>
       <mfp:author>John Fallows</mfp:author>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
Thu Jul 27 12:31:57 2006
@@ -156,9 +156,9 @@
         <mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
       </mfp:component-metadata>
       <mfp:javadoc-tags><![CDATA[@see org.apache.myfaces.trinidad.model.UploadedFile
-@see org.apache.myfaces.trinidad.webapp.AdfFacesFilter
+@see org.apache.myfaces.trinidad.webapp.TrinidadFilter
 @see org.apache.myfaces.trinidad.model.UploadedFile
-@see org.apache.myfaces.trinidad.webapp.AdfFacesFilter]]>
+@see org.apache.myfaces.trinidad.webapp.TrinidadFilter]]>
       </mfp:javadoc-tags>
       <mfp:uix2-local-name>inputFile</mfp:uix2-local-name>
       <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml
Thu Jul 27 12:31:57 2006
@@ -100,7 +100,7 @@
   <af:convertColor  patterns="rrr-ggg-bbb #RRGGBB" transparentAllowed="false" />
 </af:selectInputColor>
 <af:chooseColor id="cpConv"
-  colorData="#{adfFacesContext.colorPalette.default49}"/>
+  colorData="#{requestContext.colorPalette.default49}"/>
            ]]>
         </mfp:source-code>
       </mfp:example>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/survey.tld
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/survey.tld?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/survey.tld
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/survey.tld
Thu Jul 27 12:31:57 2006
@@ -22,12 +22,12 @@
    <tlib-version>1.0</tlib-version>
    <jsp-version>1.2</jsp-version>
    <short-name>survey</short-name>
-   <uri>http://myfaces.apache.org/adf/faces/demo</uri>
+   <uri>http://myfaces.apache.org/trinidad/demo</uri>
    <display-name>survey</display-name>   
    
    <tag>
       <name>validate_answer</name>
-      <tag-class>org.apache.myfaces.adfdemo.survey.AnswerValidatorTag</tag-class>
+      <tag-class>org.apache.myfaces.trinidaddemo.survey.AnswerValidatorTag</tag-class>
       <attribute>
          <name>questionIndex</name>
          <required>true</required>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/uixdemo.tld
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/uixdemo.tld?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/uixdemo.tld
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/uixdemo.tld
Thu Jul 27 12:31:57 2006
@@ -20,13 +20,13 @@
 <taglib>
   <tlib-version>1.0</tlib-version>
   <jsp-version>1.2</jsp-version>
-  <short-name>adf faces demo</short-name>
-  <uri>http://myfaces.apache.org/adffacesdemo</uri>
-  <display-name>adffacesdemo</display-name>    
+  <short-name>trinidad demo</short-name>
+  <uri>http://myfaces.apache.org/trinidaddemo</uri>
+  <display-name>trinidaddemo</display-name>    
 
     <tag>
       <name>dateField</name>
-      <tag-class>org.apache.myfaces.adfdemo.composite.DateFieldTag</tag-class>
+      <tag-class>org.apache.myfaces.trinidaddemo.composite.DateFieldTag</tag-class>
       <attribute>
         <name>id</name>
         <rtexprvalue>false</rtexprvalue>
@@ -86,7 +86,7 @@
     </tag>
     <tag>
       <name>convertSSN</name>   
-      <tag-class>org.apache.myfaces.adfdemo.convertValidate.ConvertSSNTag</tag-class>
+      <tag-class>org.apache.myfaces.trinidaddemo.convertValidate.ConvertSSNTag</tag-class>
       <body-content>empty</body-content>
       <description>
         The convertSSN tag converts to/from a social security number.
@@ -94,7 +94,7 @@
     </tag>    
     <tag>
       <name>validatePassword</name>   
-      <tag-class>org.apache.myfaces.adfdemo.convertValidate.ValidatePasswordTag</tag-class>
+      <tag-class>org.apache.myfaces.trinidaddemo.convertValidate.ValidatePasswordTag</tag-class>
       <body-content>empty</body-content>
       <description>
         The validatePassword tag checks to see that a password contains at least on number.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
Thu Jul 27 12:31:57 2006
@@ -76,17 +76,17 @@
   </context-param--> 
 
   <filter>
-    <filter-name>adfFaces</filter-name>
-    <filter-class>org.apache.myfaces.adf.webapp.AdfFacesFilter</filter-class>
+    <filter-name>trinidad</filter-name>
+    <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
   </filter>
 
   <filter>
     <filter-name>demoRedirect</filter-name>
-    <filter-class>org.apache.myfaces.adfdemo.webapp.RedirectFilter</filter-class>
+    <filter-class>org.apache.myfaces.trinidaddemo.webapp.RedirectFilter</filter-class>
   </filter>
   
   <filter-mapping>
-    <filter-name>adfFaces</filter-name>
+    <filter-name>trinidad</filter-name>
     <servlet-name>faces</servlet-name>
   </filter-mapping>
 
@@ -104,7 +104,7 @@
   <!-- resource loader servlet -->
   <servlet>
     <servlet-name>resources</servlet-name>
-    <servlet-class>org.apache.myfaces.adf.webapp.ResourceServlet</servlet-class>
+    <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
   </servlet>
 
   <!-- On some version of OC4J, the following is needed when using jsf 1.0 -->
@@ -137,12 +137,12 @@
   <!-- Survey Demo (Custom) Tag Library -->
   <jsp-config>
     <taglib>
-      <taglib-uri>http://myfaces.apache.org/adf/faces/demo</taglib-uri>
+      <taglib-uri>http://myfaces.apache.org/trinidad/demo</taglib-uri>
       <taglib-location>/WEB-INF/survey.tld</taglib-location>
     </taglib>
 
     <taglib>
-      <taglib-uri>http://myfaces.apache.org/adffacesdemo</taglib-uri>
+      <taglib-uri>http://myfaces.apache.org/trinidaddemo</taglib-uri>
       <taglib-location>/WEB-INF/uixdemo.tld</taglib-location>
     </taglib>
   </jsp-config>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/chooseColor.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/chooseColor.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/chooseColor.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/chooseColor.jspx
Thu Jul 27 12:31:57 2006
@@ -35,7 +35,7 @@
                 label="Enter or select color from palette below"
                 value="#{color.colorValue1}"/>                              
               <af:chooseColor id="cp1" 
-                colorData="#{adfFacesContext.colorPalette.default49}"/>
+                colorData="#{requestContext.colorPalette.default49}"/>
                           
               <af:outputFormatted styleUsage="instruction" value="&lt;b>Color Converter
with patterns &quot;rrr-ggg-bbb #RRGGBB&quot; associated with selectInputColor component&lt;/b>"/>
               
               <af:selectInputColor id="sicConv" chooseId="cpConv"
@@ -44,7 +44,7 @@
                 <af:convertColor  patterns="rrr-ggg-bbb #RRGGBB" transparentAllowed="false"
/>
               </af:selectInputColor>
               <af:chooseColor id="cpConv" 
-                colorData="#{adfFacesContext.colorPalette.default49}"/>
+                colorData="#{requestContext.colorPalette.default49}"/>
 
               <af:outputFormatted styleUsage="instruction" value="&lt;b>A chooseColor
with attribute 'colorData' bound to a list(java.util.List) of colors(java.awt.Color) and attribute
'customColorData' bound to an array of colors(java.awt.Color)&lt;/b>"/>        
                       
               <af:chooseColor id="cp2" 
@@ -53,7 +53,7 @@
   
               <af:outputFormatted styleUsage="instruction" value="&lt;b>A chooseColor
using standard 80 color palette(ADF Faces implicit object) - Update its properties  from the
table below&lt;/b>"/>                                
               <af:chooseColor binding="#{editor.component}" id="cp3" 
-                colorData="#{adfFacesContext.colorPalette.default80}" width="16"/>
+                colorData="#{requestContext.colorPalette.default80}" width="16"/>
               <jsp:directive.include file="editor.jspf" />
           </af:panelGroup>
         </af:form>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/components/selectInputColor.jspx
Thu Jul 27 12:31:57 2006
@@ -39,7 +39,7 @@
               </f:facet>
             </af:selectInputColor>
             <af:chooseColor id="cp1" 
-              colorData="#{adfFacesContext.colorPalette.default49}"/>
+              colorData="#{requestContext.colorPalette.default49}"/>
             <jsp:directive.include file="editor.jspf" />          
             <af:outputFormatted styleUsage="instruction" value="&lt;b>A selectInputColor&lt;/b>"/>
             <af:selectInputColor id="sic3"

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
Thu Jul 27 12:31:57 2006
@@ -17,7 +17,7 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:af="http://myfaces.apache.org/adf/faces"
-          xmlns:afdemo="http://myfaces.apache.org/adffacesdemo">
+          xmlns:trdemo="http://myfaces.apache.org/trinidaddemo">
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
     <af:document title="Client-side Converters and Validators">
@@ -122,14 +122,14 @@
                 <f:facet name="help">
                   <af:outputText value="examples of unconvertable values: 'a' or 'cat'"/>
                 </f:facet>
-                <afdemo:convertSSN/>
+                <trdemo:convertSSN/>
               </af:inputText>
               <af:inputText required="true" secret="true"
                             label="password validator">
                 <f:facet name="help">
                   <af:outputText value="examples of unconvertable values: 'a' or 'cat'"/>
                 </f:facet>
-                <afdemo:validatePassword/>
+                <trdemo:validatePassword/>
               </af:inputText>
             </af:panelForm>
            </af:panelHeader>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/demos/changeDemos/addRemoveReorderChildrenChange_Explicit.jspx
Thu Jul 27 12:31:57 2006
@@ -57,7 +57,7 @@
               </af:selectInputColor>
               <af:chooseColor 
                 id="cc1" 
-                colorData="#{adfFacesContext.colorPalette.default49}"/>
+                colorData="#{requestContext.colorPalette.default49}"/>
               <af:chooseDate id="cd1"/>
               <af:selectInputDate label="Date:" id="sid1" chooseId="cd1"/>
             </af:panelGroup>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
Thu Jul 27 12:31:57 2006
@@ -17,7 +17,7 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:af="http://myfaces.apache.org/adf/faces" 
-          xmlns:survey="http://myfaces.apache.org/adf/faces/demo" >
+          xmlns:survey="http://myfaces.apache.org/trinidad/demo" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
  <af:document title="Survey">

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/WEB-INF/web.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/WEB-INF/web.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/WEB-INF/web.xml
Thu Jul 27 12:31:57 2006
@@ -27,7 +27,7 @@
   <!-- Faces Filter -->
   <filter>
     <filter-name>faces</filter-name>
-    <filter-class>org.apache.myfaces.adfinternal.webapp.FacesFilter</filter-class>
+    <filter-class>org.apache.myfaces.trinidadinternal.webapp.FacesFilter</filter-class>
     <init-param>
       <param-name>faces-servlet-url-pattern</param-name>
       <param-value>/faces/*</param-value>
@@ -35,8 +35,8 @@
   </filter>
 
   <filter>
-    <filter-name>adfFaces</filter-name>
-    <filter-class>org.apache.myfaces.adf.webapp.AdfFacesFilter</filter-class>
+    <filter-name>trinidad</filter-name>
+    <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
   </filter>
 
   <!-- Faces Filter Mappings -->
@@ -46,7 +46,7 @@
   </filter-mapping>
 
   <filter-mapping>
-    <filter-name>adfFaces</filter-name>
+    <filter-name>trinidad</filter-name>
     <servlet-name>faces</servlet-name>
   </filter-mapping>
 
@@ -59,7 +59,7 @@
   <!-- resource loader servlet -->
   <servlet>
     <servlet-name>resources</servlet-name>
-    <servlet-class>org.apache.myfaces.adf.webapp.ResourceServlet</servlet-class>
+    <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
   </servlet>
 
   <!-- On some version of OC4J, the following is needed when using jsf 1.0 -->
@@ -91,12 +91,12 @@
 
   <!-- ADF Faces Tag Library -->
   <taglib>
-    <taglib-uri>http://myfaces.apache.org/adf/faces</taglib-uri>
+    <taglib-uri>http://myfaces.apache.org/trinidad</taglib-uri>
     <taglib-location>/WEB-INF/af.tld</taglib-location>
   </taglib>
 
   <taglib>
-    <taglib-uri>http://myfaces.apache.org/adf/faces/html</taglib-uri>
+    <taglib-uri>http://myfaces.apache.org/trinidad/html</taglib-uri>
     <taglib-location>/WEB-INF/afh.tld</taglib-location>
   </taglib>
 
@@ -114,7 +114,7 @@
 
   <!-- ADF Faces Demo Tag Library --> 
   <taglib>
-    <taglib-uri>http://myfaces.apache.org/adffacesdemo</taglib-uri>
+    <taglib-uri>http://myfaces.apache.org/trinidaddemo</taglib-uri>
     <taglib-location>/WEB-INF/uixdemo.tld</taglib-location>
   </taglib>
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/el.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/el.jspx?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/el.jspx
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/test/webapp/el.jspx
Thu Jul 27 12:31:57 2006
@@ -28,15 +28,15 @@
        <af:form>
          <af:messages/>
          <af:panelGroup layout="vertical">
-           <af:outputText value="Current context is #{adfFacesContext}"/>
-           <af:outputText value="Right to left? :  #{adfFacesContext.rightToLeft}"/>
-           <af:outputText value="Look and feel? :  #{adfFacesContext.lookAndFeel}"/>
-           <af:outputText value="Accessibility mode? :  #{adfFacesContext.accessibilityMode}"/>
-           <af:outputText value="Time zone? :  #{adfFacesContext.timeZone}"/>
+           <af:outputText value="Current context is #{requestContext}"/>
+           <af:outputText value="Right to left? :  #{requestContext.rightToLeft}"/>
+           <af:outputText value="Look and feel? :  #{requestContext.lookAndFeel}"/>
+           <af:outputText value="Accessibility mode? :  #{requestContext.accessibilityMode}"/>
+           <af:outputText value="Time zone? :  #{requestContext.timeZone}"/>
            
-           <af:outputText value="#{adfFacesContext.formatter['Test {0} MessageFormat']['of']}"/>
-           <af:goLink destination="#{adfFacesContext.helpSystem.frontPage}" text="Get
Help"/>
-           <af:goLink destination="#{adfFacesContext.helpTopic.ui_table}" text="Get Help"/>
+           <af:outputText value="#{requestContext.formatter['Test {0} MessageFormat']['of']}"/>
+           <af:goLink destination="#{requestContext.helpSystem.frontPage}" text="Get Help"/>
+           <af:goLink destination="#{requestContext.helpTopic.ui_table}" text="Get Help"/>
          </af:panelGroup>
        </af:form>
        </af:panelPage>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/conf/base-faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/conf/base-faces-config.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/conf/base-faces-config.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/conf/base-faces-config.xml
Thu Jul 27 12:31:57 2006
@@ -2,7 +2,7 @@
     <view-handler>org.apache.myfaces.trinidadinternal.application.ViewHandlerImpl</view-handler>
     <state-manager>org.apache.myfaces.trinidadinternal.application.StateManagerImpl</state-manager>
     <navigation-handler>org.apache.myfaces.trinidadinternal.application.NavigationHandlerImpl</navigation-handler>
-    <variable-resolver>org.apache.myfaces.trinidadinternal.el.AdfFacesVariableResolver</variable-resolver>
+    <variable-resolver>org.apache.myfaces.trinidadinternal.el.TrinidadVariableResolver</variable-resolver>
   </application>
 
   <factory>
@@ -12,7 +12,7 @@
   </factory>
 
   <lifecycle>
-    <phase-listener>org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener</phase-listener>
+    <phase-listener>org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener</phase-listener>
   </lifecycle>
 
   <converter>
@@ -147,14 +147,14 @@
   </converter>
   
   <referenced-bean>
-    <description>implicit object provided by ADF Faces</description>
-    <display-name>ADF Faces Context</display-name>
-    <referenced-bean-name>adfFacesContext</referenced-bean-name>
-    <referenced-bean-class>org.apache.myfaces.trinidad.context.AdfFacesContext</referenced-bean-class>
+    <description>implicit object provided by Trinidad</description>
+    <display-name>Request Context</display-name>
+    <referenced-bean-name>requestContext</referenced-bean-name>
+    <referenced-bean-class>org.apache.myfaces.trinidad.context.RequestContext</referenced-bean-class>
   </referenced-bean>
 
   <referenced-bean>
-    <description>ADF Faces Process Scope Map</description>
+    <description>Trinidad Process Scope Map</description>
     <display-name>Process Scope</display-name>
     <referenced-bean-name>processScope</referenced-bean-name>
     <referenced-bean-class>java.util.Map</referenced-bean-class>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
Thu Jul 27 12:31:57 2006
@@ -20,7 +20,7 @@
     <view-handler>org.apache.myfaces.trinidadinternal.application.ViewHandlerImpl</view-handler>
     <state-manager>org.apache.myfaces.trinidadinternal.application.StateManagerImpl</state-manager>
     <navigation-handler>org.apache.myfaces.trinidadinternal.application.NavigationHandlerImpl</navigation-handler>
-    <variable-resolver>org.apache.myfaces.trinidadinternal.el.AdfFacesVariableResolver</variable-resolver>
+    <variable-resolver>org.apache.myfaces.trinidadinternal.el.TrinidadVariableResolver</variable-resolver>
   </application>
 
   <factory>
@@ -31,7 +31,7 @@
   </factory>
 
   <lifecycle>
-    <phase-listener>org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener</phase-listener>
+    <phase-listener>org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener</phase-listener>
   </lifecycle>
 
   <converter>
@@ -89,14 +89,14 @@
   </converter>
   
   <referenced-bean>
-    <description>implicit object provided by ADF Faces</description>
-    <display-name>ADF Faces Context</display-name>
-    <referenced-bean-name>adfFacesContext</referenced-bean-name>
-    <referenced-bean-class>org.apache.myfaces.trinidad.context.AdfFacesContext</referenced-bean-class>
+    <description>implicit object provided by Trinidad</description>
+    <display-name>Request Context</display-name>
+    <referenced-bean-name>requestContext</referenced-bean-name>
+    <referenced-bean-class>org.apache.myfaces.trinidad.context.RequestContext</referenced-bean-class>
   </referenced-bean>
 
   <referenced-bean>
-    <description>ADF Faces Page Flow Scope Map</description>
+    <description>Trinidad Page Flow Scope Map</description>
     <display-name>Page Flow Scope</display-name>
     <referenced-bean-name>pageFlowScope</referenced-bean-name>
     <referenced-bean-class>java.util.Map</referenced-bean-class>

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
Thu Jul 27 12:31:57 2006
@@ -493,8 +493,8 @@
   static private ResponseWriter _addDebugResponseWriters(
      ResponseWriter responseWriter)
   {
-    RequestContext adfFacesContext = RequestContext.getCurrentInstance();
-    if (adfFacesContext.isDebugOutput())
+    RequestContext requestContext = RequestContext.getCurrentInstance();
+    if (requestContext.isDebugOutput())
     {
       responseWriter = new IndentingResponseWriter(responseWriter);
       responseWriter = new DebugResponseWriter(responseWriter);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
Thu Jul 27 12:31:57 2006
@@ -92,10 +92,10 @@
     String entryKey = (String) context.getExternalContext().getRequestParameterMap().get(__ENTRY_KEY_PARAM);
     if (entryKey == null)
     {
-      RequestContext adfFacesContext = RequestContext.getCurrentInstance();
-      if (adfFacesContext != null)
+      RequestContext requestContext = RequestContext.getCurrentInstance();
+      if (requestContext != null)
       {
-        Object o = adfFacesContext.getPageFlowScope().get(__ENTRY_KEY_PARAM);
+        Object o = requestContext.getPageFlowScope().get(__ENTRY_KEY_PARAM);
         if (o != null)
           entryKey = o.toString();
       }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
Thu Jul 27 12:31:57 2006
@@ -428,8 +428,8 @@
       comment += ", skin:" + skinId;
 
       // Also log preferred Skin if we have one
-      RequestContext adfFacesContext = RequestContext.getCurrentInstance();
-      String preferredSkin = adfFacesContext.getSkinFamily();
+      RequestContext requestContext = RequestContext.getCurrentInstance();
+      String preferredSkin = requestContext.getSkinFamily();
       if (preferredSkin != null)
         comment += (" (" + preferredSkin.toString() + ")");
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
Thu Jul 27 12:31:57 2006
@@ -244,8 +244,8 @@
         {
             TimeZone tz = null;
 
-            RequestContext adfFacesContext = RequestContext.getCurrentInstance();
-            tz = adfFacesContext.getTimeZone();
+            RequestContext requestContext = RequestContext.getCurrentInstance();
+            tz = requestContext.getTimeZone();
             if(tz == null)
             {
                 tz = TimeZone.getDefault();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
Thu Jul 27 12:31:57 2006
@@ -128,15 +128,15 @@
 
     _facesContext.setResponseWriter(writer);
 
-    _adfFacesContext = new MRequestContext();
-    _adfFacesContext.setSkinFamily("minimal");
-    _adfFacesContext.setAgent(RenderKitBootstrap.getGeckoAgent());
+    _requestContext = new MRequestContext();
+    _requestContext.setSkinFamily("minimal");
+    _requestContext.setAgent(RenderKitBootstrap.getGeckoAgent());
   }
   
   protected void tearDown() throws IOException
   {
     MFacesContext.clearContext();
-    _adfFacesContext.release();
+    _requestContext.release();
     if (_fileWriter != null)
       _fileWriter.close();
 
@@ -193,7 +193,7 @@
 
   private java.io.Writer     _fileWriter;
   private MFacesContext _facesContext;
-  private MRequestContext _adfFacesContext;
+  private MRequestContext _requestContext;
 
   static private RenderKitBootstrap _bootstrap;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?rev=426207&r1=426206&r2=426207&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
Thu Jul 27 12:31:57 2006
@@ -114,11 +114,11 @@
     protected void setUp() throws IOException  
     {
       _facesContext = new MFacesContext(true);
-      _adfFacesContext = new MRequestContext();
-      _adfFacesContext.setSkinFamily(_skin);
-      _adfFacesContext.setAgent(_agent);
-      _adfFacesContext.setRightToLeft(_rightToLeft);
-      _adfFacesContext.setAccessibilityMode(_accMode);
+      _requestContext = new MRequestContext();
+      _requestContext.setSkinFamily(_skin);
+      _requestContext.setAgent(_agent);
+      _requestContext.setRightToLeft(_rightToLeft);
+      _requestContext.setAccessibilityMode(_accMode);
 
       UIViewRoot root = RenderKitBootstrap.createUIViewRoot(_facesContext);
       root.setRenderKitId(getRenderKitId());
@@ -143,10 +143,10 @@
       }
 
       MFacesContext.clearContext();
-      _adfFacesContext.release();
+      _requestContext.release();
 
       _facesContext = null;
-      _adfFacesContext = null;
+      _requestContext = null;
       _result = null;
     }
 
@@ -207,7 +207,7 @@
 
     private TestResult    _result;
     private MFacesContext _facesContext;
-    private MRequestContext _adfFacesContext;
+    private MRequestContext _requestContext;
     private String           _skin;
     private Agent            _agent;
     private String           _accMode;



Mime
View raw message