You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/11/02 20:07:41 UTC

svn commit: r470498 [1/2] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/lo...

Author: awiner
Date: Thu Nov  2 12:07:33 2006
New Revision: 470498

URL: http://svn.apache.org/viewvc?view=rev&rev=470498
Log:
Fix a whole bunch of references to ADF or ADF Faces in comments, javadoc, tagdoc, variable names, etc.  Remaining references to ADF that I can think of are:
- Names of the internal agent properties
- Some Javascript functions

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogger.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/UploadedFile.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/LocaleUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/EditableValue.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Input.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Output.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPartialRoot.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectItem.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Thu Nov  2 12:07:33 2006
@@ -26,7 +26,7 @@
  * </p>
  * <p>
  * Capability names that are implementation private must be defined so using appropriate
- * naming schemes. ADF private capability names are prefixed using "-adfinternal-xxx",
+ * naming schemes. Trinidad private capability names are prefixed using "-adfinternal-xxx",
  * and such capability names (and their values) may change at anytime
  * (and not guaranteed to be supported in future releases).
  * <p>

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java Thu Nov  2 12:07:33 2006
@@ -24,7 +24,7 @@
 
 /**
  * The DialogService API defines a number of
- * APIs that are needed to implement ADF Faces dialogs,
+ * APIs that are needed to implement Apache Trinidad dialogs,
  * but will only rarely be called by page authors.
  * They are instead intended for developers of controller
  * frameworks and component developers.

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Thu Nov  2 12:07:33 2006
@@ -166,7 +166,7 @@
     Map<String, Object> windowProperties);
 
   //
-  // General ADF Faces
+  // General Apache Trinidad
   //
 
   /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java Thu Nov  2 12:07:33 2006
@@ -62,8 +62,8 @@
  * value registered in trinidad-config.xml is obtained using
  * api from {@link org.apache.myfaces.trinidad.context.RequestContext}.</p>
  *
- * <p>Since ADF Faces is compatible only with JDK 1.4 and higher versions,
- * the <code>currencyCode</code> gets preferance over <code>currencySymbol</code>
+ * <p>Since Apache Trinidad is compatible only with JDK 1.4 and higher versions,
+ * the <code>currencyCode</code> gets preference over <code>currencySymbol</code>
  * See RI's {@link javax.faces.convert.NumberConverter} for the way in which
  * <code>currencyCode</code> and <code>currencySymbol</code> gets preference for
  * different version of JDK.

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogRecord.java Thu Nov  2 12:07:33 2006
@@ -75,7 +75,7 @@
       StackTraceElement frame = stack[i];
       String cname = frame.getClassName();
       if (cname.equals(_JDK_LOG_CLASS) ||
-          cname.equals(_ADF_LOG_CLASS))
+          cname.equals(_TRINIDAD_LOG_CLASS))
         break;
 
       i++;
@@ -88,7 +88,7 @@
       String cname = frame.getClassName();
 
       if (cname.equals(_JDK_LOG_CLASS) ||
-          cname.equals(_ADF_LOG_CLASS))
+          cname.equals(_TRINIDAD_LOG_CLASS))
       {
         i++;
         continue;
@@ -121,7 +121,7 @@
   private static final String _JDK_LOG_CLASS = 
     "java.util.logging.Logger";
   
-  private static final String _ADF_LOG_CLASS =
+  private static final String _TRINIDAD_LOG_CLASS =
     "org.apache.myfaces.trinidad.logging.TrinidadLogger";
 }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogger.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogger.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogger.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/logging/TrinidadLogger.java Thu Nov  2 12:07:33 2006
@@ -40,7 +40,7 @@
   }
 
   /**
-   * Get the Java logger from an ADF Logger.
+   * Get the Java logger from an Trinidad Logger.
    * 
    * @return a java Logger instance
    */

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/UploadedFile.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/UploadedFile.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/UploadedFile.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/UploadedFile.java Thu Nov  2 12:07:33 2006
@@ -47,7 +47,7 @@
    * {@link org.apache.myfaces.trinidad.webapp.UploadedFileProcessor}.
    * This is always null with the default <code>UploadedFileProcessor</code>,
    * but custom implementations may use this to pass additional information
-   * needed for later processing.  (Note that ADF Faces cannot
+   * needed for later processing.  (Note that Apache Trinidad cannot
    * cannot guarantee that the  instance returned from
    * code>UploadedFileProcessor</code> is the same one made available
    * later.

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentUtils.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentUtils.java Thu Nov  2 12:07:33 2006
@@ -20,7 +20,7 @@
 import java.util.TimeZone;
 
 /**
- * Utility functions used by the ADF Faces components.
+ * Utility functions used by the Apache Trinidad components.
  * <p>
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/util/ComponentUtils.java#0 $) $Date: 10-nov-2005.19:08:37 $
  * @author The Oracle ADF Faces Team

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/LocaleUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/LocaleUtils.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/LocaleUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/LocaleUtils.java Thu Nov  2 12:07:33 2006
@@ -170,14 +170,14 @@
     {
       try
       {
-        bundle = ResourceBundle.getBundle(_ADF_FACES_MESSAGE_BUNDLE,
+        bundle = ResourceBundle.getBundle(_APACHE_TRINIDAD_MESSAGE_BUNDLE,
                                           locale, loader);
         // let us cache the found bundle
         _cacheBundle(locale, bundle);
       }
       catch (MissingResourceException missingResource)
       {
-        _LOG.severe("unable to load bundle " +_ADF_FACES_MESSAGE_BUNDLE);
+        _LOG.severe("unable to load bundle " +_APACHE_TRINIDAD_MESSAGE_BUNDLE);
         _LOG.severe(missingResource);
       }
     }
@@ -279,7 +279,7 @@
   }
 
 
-  private static final String _ADF_FACES_MESSAGE_BUNDLE
+  private static final String _APACHE_TRINIDAD_MESSAGE_BUNDLE
     = "org.apache.myfaces.trinidad.resource.MessageBundle";
 
   // cache Bundles based on locale

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java Thu Nov  2 12:07:33 2006
@@ -474,7 +474,7 @@
    * @return an array of each constituent value, or null
    *  if there are no tokens (that is, the string is empty or
    *  all whitespace)
-   * @todo Move to utility function somewhere (ADF Share?)
+   * @todo Move to utility function somewhere 
    */
   static private final String[] _parseNameTokens(String stringValue)
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java Thu Nov  2 12:07:33 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.model.UploadedFile;
 
 /**
- * Interface responsible for processing file uploads.  An ADF Faces
+ * Interface responsible for processing file uploads.  An Apache Trinidad
  * application has a single <code>UploadedFileProcessor</code> instance.
  * It is accessible from the {@link org.apache.myfaces.trinidad.context.RequestContext},
  * but will be invoked automatically by the framework as needed.  Developers

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java Thu Nov  2 12:07:33 2006
@@ -288,7 +288,7 @@
 
       try
       {
-        // ADF Converter is not lenient.
+        // Trinidad Converter is not lenient.
         converter.setMessageDetailConvertDate(customMessage[0]);
         converter.setMessageDetailConvertTime(customMessage[1]);
         converter.setMessageDetailConvertBoth(customMessage[2]);
@@ -343,4 +343,4 @@
   private MockRequestContext _mafct;
 
   private static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getDefault();
-}
\ No newline at end of file
+}

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java Thu Nov  2 12:07:33 2006
@@ -33,8 +33,8 @@
 import junit.framework.TestSuite;
 
 /**
- * Test ADF NumberConverter
- * @author Vijay Venaktaraman (vijay.venkataraman@oracle.com)
+ * Test Trinidad NumberConverter
+ * @author Vijay Venaktaraman
  * @version $Name: $ ($version: $) $Date: 16-aug-2005.15:12:23 $
  */
 public class TrinidadNumberConverterTest extends NumberConverterTestCase
@@ -120,7 +120,7 @@
      context.getViewRoot().setLocale(locale);
      try
      {
-       // ADF Converter is not lenient.
+       // Trinidad Converter is not lenient.
        Object obj = converter.getAsObject(context, wrapper.getUIComponent(), inputValue);
        fail("Expected converter exception");
      }
@@ -158,7 +158,7 @@
 
       try
       {
-         // ADF Converter is not lenient.
+         // Trinidad Converter is not lenient.
          converter.setMessageDetailConvertNumber(customMessage[0]);
          converter.setMessageDetailConvertPercent(customMessage[1]);
          converter.setMessageDetailConvertCurrency(customMessage[2]);

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF Chart is used to diplay data in a chart format.]]>
+    <description><![CDATA[The Apache Trinidad Chart is used to diplay data in a chart format.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/basechart.png</small-icon>
@@ -65,7 +65,7 @@
       <mfp:renderer-type>org.apache.myfaces.trinidad.Chart</mfp:renderer-type>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXChartTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-          The ADF Chart is used to display data in a Chart Format.
+          The Apache Trinidad Chart is used to display data in a Chart Format.
         </html:p>]]>
       </mfp:long-description>
       <mfp:author>Venkata Guddanti</mfp:author>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/EditableValue.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/EditableValue.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/EditableValue.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/EditableValue.xml Thu Nov  2 12:07:33 2006
@@ -22,7 +22,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[The editableValue web element contains all the shared attributes
-          supported by all ADF Faces components that support the JSF
+          supported by all Apache Trinidad components that support the JSF
           EditableValueHolder interface.]]>
     </description>
     <icon>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Input.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Input.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Input.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Input.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[UIXInput is a base class for all ADF Faces input components.]]></description>
+    <description><![CDATA[UIXInput is a base class for all Apache Trinidad input components.]]></description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/input.png</small-icon>
     </icon>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[ADF Faces navigationTree components are used to display hierarchical navigation data.]]></description>
+    <description><![CDATA[Apache Trinidad navigationTree components are used to display hierarchical navigation data.]]></description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/baseNavigationTree.png</small-icon>
     </icon>
@@ -128,7 +128,7 @@
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXNavigationTreeTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
           
-            ADF Faces navigationTree components are used to display hierarchical navigation data.
+            Apache Trinidad navigationTree components are used to display hierarchical navigation data.
           </html:p>]]>
       </mfp:long-description>
       <mfp:author>Gabrielle Crawford</mfp:author>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Output.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Output.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Output.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Output.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[UIXOutput is a concrete base class for all ADF Faces output components that
+    <description><![CDATA[UIXOutput is a concrete base class for all Apache Trinidad output components that
 support type conversion.]]>
     </description>
     <icon>
@@ -34,7 +34,7 @@
       <mfp:component-supertype>org.apache.myfaces.trinidad.Value</mfp:component-supertype>
       <mfp:renderer-type>org.apache.myfaces.trinidad.Text</mfp:renderer-type>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXOutputTag</mfp:tag-class>
-      <mfp:long-description><![CDATA[UIXOutput is a concrete base class for all ADF Faces output components that
+      <mfp:long-description><![CDATA[UIXOutput is a concrete base class for all Apache Trinidad output components that
 support type conversion.  All UIXOutput classes output something,
 but they all also support a &quot;value&quot; attribute that can be converted
 into a String with a <html:code>javax.faces.convert.Converter</html:code>.]]>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Subform.xml Thu Nov  2 12:07:33 2006
@@ -89,7 +89,7 @@
 this main content is in a UIXSubform, it could not be fully
 processed whenever those buttons are clicked, since those
 buttons aren't inside of the UIXSubform.  To support this
-scenario, ADF Faces supports a &quot;default&quot; property on
+scenario, Apache Trinidad supports a &quot;default&quot; property on
 UIXSubform.  A &quot;default&quot; subform behaves like any other
 subform in most respects, but if <html:em>no</html:em> subforms
 are &quot;submitted&quot; - if no subform has an appropriate event

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml Thu Nov  2 12:07:33 2006
@@ -126,7 +126,7 @@
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXTreeTag</mfp:tag-class>
       <mfp:naming-container>true</mfp:naming-container>
       <mfp:long-description><![CDATA[<html:p>
-            ADF Faces tree components are used to display hierarchical data. 
+            Apache Trinidad tree components are used to display hierarchical data. 
             For example,
             if we have a personnel organization chart depicting all the direct 
             reports under 
@@ -138,7 +138,7 @@
       
           <section name="The Tree Model">
             <html:P>
-              The ADF tree components use a model to access the data in the
+              The Apache Trinidad tree components use a model to access the data in the
               underlying hierarchy.  The specific model class is
               <html:code>org.apache.myfaces.trinidad.model.TreeModel</html:code>.
 
@@ -150,7 +150,7 @@
 
           <section name="Data">
             <html:P>
-              The tree components use a stamping strategy similar to the ADF Table
+              The tree components use a stamping strategy similar to the Trinidad Table
               component.  Child components are used to display the
               data for each element in the tree. Each child component is not recreated
               per element; instead, each child is repeatedly
@@ -182,7 +182,7 @@
 
           <section name="Expand/Collapse State">
             <html:P>
-              The ADF tree components use an instance of the
+              The Trinidad tree components use an instance of the
               <html:code>org.apache.myfaces.trinidad.model.RowKeySet</html:code>
               class to keep track
               of which elements are expanded. This instance is stored

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF TreeTable is used to display data that is structured in a hierarchical format.]]>
+    <description><![CDATA[The Apache Trinidad TreeTable is used to display data that is structured in a hierarchical format.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/baseTreeTable.png</small-icon>
@@ -72,9 +72,9 @@
       <mfp:renderer-type>org.apache.myfaces.trinidad.BaseTreeTable</mfp:renderer-type>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXTreeTableTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-          The ADF TreeTable is used to display data that is structured in a hierarchical format.
+          The Apache Trinidad TreeTable is used to display data that is structured in a hierarchical format.
           This component displays a hierarchy
-          in a UI similar to an ADF Table, and is more elaborate than the Tree component.
+          in a UI similar to a Trinidad Table, and is more elaborate than the Tree component.
           TreeTable supports displaying columns of data per element in the hierarchy.
           Unlike the Tree component, TreeTable
           only supports single rooted hierarchies. The features of the TreeTable
@@ -83,7 +83,7 @@
         </html:p>
 
         <html:p>
-          Like the Table, the TreeTable's children must be ADF
+          Like the Table, the TreeTable's children must be Trinidad
           Column components. Like the Tree, the TreeTable has a &quot;nodeStamp&quot;
           facet which renders the &quot;Object Name&quot; Column.
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Value.xml Thu Nov  2 12:07:33 2006
@@ -22,7 +22,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[The UIXValue component contains all the shared attributes
-   supported by all ADF Faces components that support the JSF
+   supported by all Apache Trinidad components that support the JSF
    ValueHolder interface, and therefore support values and Converters.]]>
     </description>
     <icon>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml Thu Nov  2 12:07:33 2006
@@ -17,7 +17,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF Chart is used to diplay data in a chart format.]]>
+    <description><![CDATA[The Trinidad Chart is used to diplay data in a chart format.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/chart.png</small-icon>
@@ -156,7 +156,7 @@
       <mfp:tag-name>tr:chart</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.data.CoreChartTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-          The ADF Chart is used to display data as a chart.
+          The Trinidad Chart is used to display data as a chart.
         </html:p>]]>
       </mfp:long-description>
       <mfp:example>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml Thu Nov  2 12:07:33 2006
@@ -222,8 +222,8 @@
           instance for each color to display.
           </html:p>
           <html:p>
-          In order to simplify the use of standard palettes, ADF Faces makes 
-          certain palettes available via the uix.colorPalette EL implicit 
+          In order to simplify the use of standard palettes, Apache Trinidad makes 
+          certain palettes available via the requestContext.colorPalette EL implicit 
           object.  The &quot;#{requestContext.colorPalette}&quot; implicit object
           provides access to four standard color palettes:
           <html:ul>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreColumn.xml Thu Nov  2 12:07:33 2006
@@ -111,7 +111,7 @@
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.data.CoreColumnTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<P>
             The immediate children of a Table component must all be
-            <code>&lt;tr:column&gt;</code> components. Each visible ADF Column
+            <code>&lt;tr:column&gt;</code> components. Each visible Trinidad Column
             component creates a separate column in the Table.
           </P>
           <P>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreGoLink.xml Thu Nov  2 12:07:33 2006
@@ -119,7 +119,7 @@
             "id" attribute:</xhtml:p>
         <mfp:source-code>&lt;tr:goLink id="foo"/&gt;</mfp:source-code>
         <xhtml:p>A standard goLink:</xhtml:p>
-        <mfp:source-code>&lt;tr:goLink text="ADF Faces"
+        <mfp:source-code>&lt;tr:goLink text="Trinidad"
               destination="http://myfaces.apache.org"/&gt;</mfp:source-code>
       </mfp:example>
       <mfp:author>Andy Schwartz</mfp:author>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreIcon.xml Thu Nov  2 12:07:33 2006
@@ -32,7 +32,7 @@
               exist for ".AFRequiredIcon", ".AFWarningIcon",
               ".AFInfoIcon", and ".AFErrorIcon". They are "required",
               "warning", "info", and "error" respectively.
-              See the ADF Faces skins documentation for a list of icon names.]]>
+              See the Apache Trinidad skins documentation for a list of icon names.]]>
       </description>
       <property-name>name</property-name>
       <property-class>java.lang.String</property-class>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[The importScript tag supports importing the built-in scripts
-         provided by ADF Faces.]]>
+         provided by Apache Trinidad.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/importScript.png</small-icon>
@@ -47,7 +47,7 @@
       <mfp:tag-name>tr:importScript</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.CoreImportScriptTag</mfp:tag-class>
       <mfp:long-description><![CDATA[The importScript component supports importing the built-in scripts
-          provided by ADF Faces.  It can be used to ensure that a Javascript
+          provided by Apache Trinidad.  It can be used to ensure that a Javascript
           function is available before using it in a Javascript handler.
           Only the first reference to a script will result in its
           being imported.]]>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml Thu Nov  2 12:07:33 2006
@@ -134,13 +134,13 @@
       <mfp:tag-name>tr:inputFile</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.input.CoreInputFileTag</mfp:tag-class>
       <mfp:long-description><![CDATA[The inputFile component is a component that can
-          be used to upload a file.  Any ADF form that contains this component
+          be used to upload a file.  Any Trinidad form that contains this component
           must have usesUpload set to true.  The &quot;value&quot; property
           of an inputFile component will be set to an instance
           of the <html:code>org.apache.myfaces.trinidad.model.UploadedFile</html:code>
           class when a file is uploaded (with the appropriate
           <html:code>ValueChangeEvent</html:code> delivered.)  Before
-          using this, developers must install the ADF Faces filter.]]>
+          using this, developers must install the Apache Trinidad filter.]]>
       </mfp:long-description>
       <mfp:example>
         <mfp:source-code><![CDATA[<tr:form usesUpload="true">

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMessage.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[Component that displays a message on behalf of a component.
-ADF input components typically support automatically showing
+Trinidad input components typically support automatically showing
 their own messages, so this tag should be used only when
 setting the "simple" attribute to true.]]>
     </description>
@@ -74,11 +74,11 @@
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreMessageTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
  Component that displays a message on behalf of a component.
- ADF input components typically support automatically showing
+ Trinidad input components typically support automatically showing
  their own messages, including a tip and the error message.
  Developers should use this when they set &quot;simple&quot;
- to &quot;true&quot; on an ADF input component, or when using
- a non-ADF input component.
+ to &quot;true&quot; on an Trinidad input component, or when using
+ a non-Trinidad input component.
 </html:p>]]>
       </mfp:long-description>
       <mfp:example>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml Thu Nov  2 12:07:33 2006
@@ -20,7 +20,7 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF NavigationTree is used to display data that is structured in a hierarchical format.]]>
+    <description><![CDATA[The Trinidad NavigationTree is used to display data that is structured in a hierarchical format.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/navigationTree.png</small-icon>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml Thu Nov  2 12:07:33 2006
@@ -67,9 +67,9 @@
       <mfp:example>
         <xhtml:p>The following is an example of panelAccordion.</xhtml:p>
         <mfp:source-code><![CDATA[<tr:panelAccordion>
-          <tr:showDetailItem text="ADF Faces Components">
-            <tr:panelHeader text="ADF Faces Components First Child"/>
-            <tr:panelHeader text="ADF Faces Components Second Child"/>
+          <tr:showDetailItem text="Apache Trinidad Components">
+            <tr:panelHeader text="Apache Trinidad Components First Child"/>
+            <tr:panelHeader text="Apache Trinidad Components Second Child"/>
           </tr:showDetailItem>
           <tr:showDetailItem text="Architecture" disabled="true">
             <tr:panelHeader text="Architecture First Child"/>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelFormLayout.xml Thu Nov  2 12:07:33 2006
@@ -110,12 +110,12 @@
            columns, and also supports a footer facet.
           </html:p>
           <html:p>
-           Usually, this component will simply contain labelled ADF Faces input
+           Usually, this component will simply contain labelled Apache Trinidad input
            components in its main content - these are inputText, inputFile,
-           selectInputColor, selectInputText, selectInputDate,
-           selectBooleanCheckBox, selectBooleanRadio, selectOneChoice,
-           selectOneListBox, selectOneRadio, and
-           selectManyListBox.  These components must have
+           inputColor, inputListOfValues, inputDate,
+           selectBooleanCheckbox, selectBooleanRadio, selectOneChoice,
+           selectOneListbox, selectOneRadio, selectManyCheckbox, and
+           selectManyListbox.  These components must have
            their &quot;simple&quot; attribute set to false, which is the default,
            and will cause the labels and fields inside the panelFormLayout
            to be aligned vertically.
@@ -181,10 +181,10 @@
       <mfp:author>Gabrielle Crawford</mfp:author>
       <mfp:component-metadata>
         <mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
-        <mfp:preferred-children>tr:inputText tr:inputHidden tr:inputFile tr:selectBooleanCheckBox
+        <mfp:preferred-children>tr:inputText tr:inputFile tr:selectBooleanCheckbox
           tr:selectBooleanRadio tr:inputColor tr:inputDate
-          tr:inputListOfValues tr:selectManyListBox tr:selectOneChoice 
-          tr:selectOneRadio tr:panelLabelAndMessage
+          tr:inputListOfValues tr:selectManyListbox tr:selectOneChoice 
+          tr:selectOneRadio tr:panelLabelAndMessage tr:selectManyCheckbox
         </mfp:preferred-children>
       </mfp:component-metadata>
       <mfp:uix2-local-name>messageComponentLayout</mfp:uix2-local-name>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelGroupLayout.xml Thu Nov  2 12:07:33 2006
@@ -62,11 +62,11 @@
   <f:facet name="separator">
     <tr:spacer width="10" height="1"/>
   </f:facet>
-  <tr:goLink text="ADF Faces 1"
+  <tr:goLink text="Apache Trinidad 1"
         destination="http://myfaces.apache.org"/>
-  <tr:goLink text="ADF Faces 2"
+  <tr:goLink text="Apache Trinidad 2"
         destination="http://myfaces.apache.org"/>
-  <tr:goLink text="ADF Faces 3"
+  <tr:goLink text="Apache Trinidad 3"
         destination="http://myfaces.apache.org"/>
 </tr:panelGroupLayoutLayout>]]>
         </mfp:source-code>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHeader.xml Thu Nov  2 12:07:33 2006
@@ -79,9 +79,9 @@
         <xhtml:p>Basic example.</xhtml:p>
         <mfp:source-code>
           <![CDATA[<tr:panelHeader text="This is a panelHeader">
-  <tr:goLink text="ADF Faces" destination="http://myfaces.apache.org"/>
+  <tr:goLink text="Apache Trinidad" destination="http://myfaces.apache.org"/>
   <tr:panelHeader text="This is a Sub-panelHeader" >
-    <tr:goLink text="ADF Faces" destination="http://myfaces.apache.org"/>
+    <tr:goLink text="Apache Trinidad" destination="http://myfaces.apache.org"/>
   </tr:panelHeader>
 </tr:panelHeader>]]>
         </mfp:source-code>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelHorizontalLayout.xml Thu Nov  2 12:07:33 2006
@@ -72,11 +72,11 @@
   <f:facet name="separator">
     <tr:spacer width="10" height="1"/>
   </f:facet>
-  <tr:goLink text="ADF Faces 1"
+  <tr:goLink text="Apache Trinidad 1"
         destination="http://myfaces.apache.org"/>
-  <tr:goLink text="ADF Faces 2"
+  <tr:goLink text="Apache Trinidad 2"
         destination="http://myfaces.apache.org"/>
-  <tr:goLink text="ADF Faces 3"
+  <tr:goLink text="Apache Trinidad 3"
         destination="http://myfaces.apache.org"/>
 </tr:panelHorizontalLayout>]]>
         </mfp:source-code>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelLabelAndMessage.xml Thu Nov  2 12:07:33 2006
@@ -19,8 +19,8 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xi="http://www.w3.org/2001/XInclude">
   <component>
-    <description><![CDATA[This component lays out a label and children.  Typically, the only child of this component will be an input element of some sort, but as many children as necessary can be added.  When using panelLabelAndMessage with ADF input components, you should always set simple="true" on the input components.  Non-simple ADF input components already effectively have all the functionality of panelLabelAndMessage.
-      To lay out multiple panelLabelAndMessage components - or multiple non-simple ADF input components - you can use the panelForm component.  When panelLabelAndMessage components are placed inside a panelForm the labels will line up.]]></description>
+    <description><![CDATA[This component lays out a label and children.  Typically, the only child of this component will be an input element of some sort, but as many children as necessary can be added.  When using panelLabelAndMessage with Trinidad input components, you should always set simple="true" on the input components.  Non-simple Trinidad input components already effectively have all the functionality of panelLabelAndMessage.
+      To lay out multiple panelLabelAndMessage components - or multiple non-simple Trinidad input components - you can use the panelForm component.  When panelLabelAndMessage components are placed inside a panelForm the labels will line up.]]></description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/panelLabelAndMessage.png</small-icon>
     </icon>
@@ -130,16 +130,16 @@
           This component lays out a label, children, tip, and associated message.
           Typically, the only child of this component will be an
           input element of some sort, but as many children as necessary can
-          be added.  When using panelLabelAndMessage with ADF
+          be added.  When using panelLabelAndMessage with Trinidad
           input components, you should <html:strong>always</html:strong>
           set <html:code>simple=&quot;true&quot;</html:code> on the input
-          components.  Non-simple ADF input components already
+          components.  Non-simple Trinidad input components already
           effectively have all the functionality of
           panelLabelAndMessage.
         </html:p>
         <html:p>
           To lay out multiple panelLabelAndMessage components - or multiple
-          non-simple ADF input components - you can use the
+          non-simple Trinidad input components - you can use the
           panelForm component.  When panelLabelAndMessage components are
           placed inside a panelForm the labels will line up.
         </html:p>]]>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPartialRoot.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPartialRoot.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPartialRoot.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPartialRoot.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[panelPartialRoot enables partial-page rendering on pages that cannot
-use the ADF document or body tags.]]>
+use the Trinidad document or body tags.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/panelPartialRoot.png</small-icon>
@@ -57,7 +57,7 @@
       <mfp:long-description><![CDATA[<html:p>
         The panelPartialRoot component is used to enable partial page
         rendering of a UIComponent tree or subtree.  Most pages will simply
-        use the ADF document tag, or failing that the ADF body tag, but
+        use the Trinidad document tag, or failing that the Trinidad body tag, but
 	if neither are possible, this component may be used instead.
         There may be multiple panelPartialRoot blocks on a page.
         </html:p>]]>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelTabbed.xml Thu Nov  2 12:07:33 2006
@@ -204,9 +204,9 @@
       <mfp:example>
         <xhtml:p>The following is an example of panelTabbed.</xhtml:p>
         <mfp:source-code><![CDATA[<tr:panelTabbed>
-          <tr:showDetailItem text="ADF Faces Components">
-            <tr:panelHeader text="ADF Faces Components First Child"/>
-            <tr:panelHeader text="ADF Faces Components Second Child"/>
+          <tr:showDetailItem text="Apache Trinidad Components">
+            <tr:panelHeader text="Apache Trinidad Components First Child"/>
+            <tr:panelHeader text="Apache Trinidad Components Second Child"/>
           </tr:showDetailItem>
           <tr:showDetailItem text="Architecture" disabled="true">
             <tr:panelHeader text="Architecture First Child"/>
@@ -220,9 +220,9 @@
         </mfp:source-code>
         <xhtml:p>The following example renders with the tab bar appearing only above the contents.</xhtml:p>
         <mfp:source-code><![CDATA[<tr:panelTabbed>
-          <tr:showDetailItem text="ADF Faces Components" position="above">
-            <tr:panelHeader text="ADF Faces Components First Child"/>
-            <tr:panelHeader text="ADF Faces Components Second Child"/>
+          <tr:showDetailItem text="Apache Trinidad Components" position="above">
+            <tr:panelHeader text="Apache Trinidad Components First Child"/>
+            <tr:panelHeader text="Apache Trinidad Components Second Child"/>
           </tr:showDetailItem>
           <tr:showDetailItem text="Architecture">
             <tr:panelHeader text="Architecture First Child"/>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectItem.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectItem.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectItem.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectItem.xml Thu Nov  2 12:07:33 2006
@@ -21,7 +21,7 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[The selectItem tag represents a single item that the user
-may select from a list, choice, radio, or shuttle ADF control.]]>
+may select from a list, choice, radio, or shuttle Trinidad control.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/selectItem.png</small-icon>
@@ -72,7 +72,7 @@
       <mfp:tag-name>tr:selectItem</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.input.CoreSelectItemTag</mfp:tag-class>
       <mfp:long-description><![CDATA[The selectItem tag represents a single item that the user
-may select from a list, choice, radio, or shuttle ADF control.
+may select from a list, choice, radio, or shuttle Trinidad control.
 It may be used in place of the JSF selectItem or selectItems
 tags, but is very similar (largely not requiring &quot;item&quot; in front
 of its attributes.)]]>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml Thu Nov  2 12:07:33 2006
@@ -330,7 +330,7 @@
   The selectManyShuttle does not allow for reordering;
   the selectOrderShuttle component adds this functionality
   to selectManyShuttle.  selectManyShuttle also does not include
-  automatic messaging support, unlike most other ADF messaging
+  automatic messaging support, unlike most other Trinidad messaging
   components.
          </html:p>
           <section name="Attributes">

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml Thu Nov  2 12:07:33 2006
@@ -21,8 +21,8 @@
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
     <description><![CDATA[The styleSheet tag generates the style
-          sheet link reference to a generated ADF Faces style sheet.
-          This is automatically included for you if you use the ADF head tag.]]>
+          sheet link reference to a generated Apache Trinidad style sheet.
+          This is automatically included for you if you use the Trinidad head tag.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/styleSheet.png</small-icon>
@@ -36,8 +36,8 @@
       <mfp:tag-name>trh:styleSheet</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.CoreStyleSheetTag</mfp:tag-class>
       <mfp:long-description><![CDATA[The styleSheet component generates the style
-          sheet link reference to a generated ADF Faces style sheet.
-          This is automatically included for you if you use the ADF
+          sheet link reference to a generated Apache Trinidad style sheet.
+          This is automatically included for you if you use the Trinidad
           HtmlHead component.]]>
       </mfp:long-description>
       <mfp:author>Brian Albers</mfp:author>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml Thu Nov  2 12:07:33 2006
@@ -20,7 +20,7 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF Table is used to display tabular data. It also supports selection (both single and multiple), sorting, record navigation and detail-disclosure.]]>
+    <description><![CDATA[The Trinidad Table is used to display tabular data. It also supports selection (both single and multiple), sorting, record navigation and detail-disclosure.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/table.png</small-icon>
@@ -49,13 +49,13 @@
       <mfp:renderer-type>org.apache.myfaces.trinidad.Table</mfp:renderer-type>
       <mfp:tag-name>tr:table</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.data.CoreTableTag</mfp:tag-class>
-      <mfp:long-description><![CDATA[The ADF Table is used to display tabular data. It also supports selection
+      <mfp:long-description><![CDATA[The Trinidad Table is used to display tabular data. It also supports selection
 (both single and multiple), sorting, record navigation and
 detail-disclosure.
 
          <section name="Table Model">
            <p>
-            The ADF Table component uses a model to access the data
+            The Trinidad Table component uses a model to access the data
             in the underlying list. The specific model class is
             <code>org.apache.myfaces.trinidad.model.CollectionModel</code>.
             You may also use other model instances, e.g.,
@@ -70,7 +70,7 @@
         <section name="Columns">
           <P>
             The immediate children of a Table component must all be
-            <code>&lt;tr:column&gt;</code> components. Each visible ADF Column
+            <code>&lt;tr:column&gt;</code> components. Each visible Trinidad Column
             component creates a separate column in the Table.
             For more information see the documentation for
             <code>&lt;column&gt;</code>
@@ -129,7 +129,7 @@
             The selection feature of a Table lets the user select one
             or more rows in the list. The user can then perform some operation on
             the selected rows by activating an appropriate ActionSource component (e.g.,
-            by clicking on an ADF CommandButton). Use the &quot;selection&quot; facet on the Table
+            by clicking on a commandButton). Use the &quot;selection&quot; facet on the Table
       to enable the selection feature.
           </p>
           <p>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml Thu Nov  2 12:07:33 2006
@@ -20,7 +20,7 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The ADF TreeTable is used to display data that is structured in a hierarchical format.]]>
+    <description><![CDATA[The Trinidad TreeTable is used to display data that is structured in a hierarchical format.]]>
     </description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/treeTable.png</small-icon>
@@ -71,9 +71,9 @@
       <mfp:tag-name>tr:treeTable</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.data.CoreTreeTableTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-          The ADF TreeTable is used to display data that is structured in a hierarchical format.
+          The Trinidad TreeTable is used to display data that is structured in a hierarchical format.
           This component displays a hierarchy
-          in a UI similar to an ADF Table, and is more elaborate than the Tree component.
+          in a UI similar to an Trinidad Table, and is more elaborate than the Tree component.
           TreeTable supports displaying columns of data per element in the hierarchy.
           Unlike the Tree component, TreeTable
           only supports single rooted hierarchies. The features of the TreeTable
@@ -82,7 +82,7 @@
         </html:p>
 
         <html:p>
-          Like the Table, the TreeTable's children must be ADF
+          Like the Table, the TreeTable's children must be Trinidad
           Column components. Like the Tree, the TreeTable has a &quot;nodeStamp&quot;
           facet which renders the &quot;Object Name&quot; Column.
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml Thu Nov  2 12:07:33 2006
@@ -26,7 +26,7 @@
     <component-type>org.apache.myfaces.trinidad.HtmlBody</component-type>
     <component-class>org.apache.myfaces.trinidad.component.html.HtmlBody</component-class>
     <property>
-      <description><![CDATA[whether or not ADF will allow the first click to go
+      <description><![CDATA[whether or not Trinidad will allow the first click to go
              through in certain instances. When a PPR event occurs, we block
              all subsequent user input until it completes. However, there may
              be instances where the client wants to receive the very first
@@ -233,12 +233,8 @@
       <mfp:long-description><![CDATA[<html:p>
             Tag for the HTML body element.  In addition
 to providing support for the standard HTML body functionality,
-the ADF body component enables partial-page rendering (PPR) support
+the Trinidad body component enables partial-page rendering (PPR) support
 and assigning initial page focus.
-<!--
-as well as automatic detection of dirtied content (via
-the navigationFormName attribute).
--->
           </html:p>]]>
       </mfp:long-description>
       <mfp:example>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml Thu Nov  2 12:07:33 2006
@@ -271,7 +271,7 @@
     </tr:panelGroupLayout>
   </trh:rowLayout>
   <trh:rowLayout>
-    <tr:panelHeader text="ADF Faces Components"/>
+    <tr:panelHeader text="Apache Trinidad Components"/>
     <trh:cellFormat columnSpan="2">
       <tr:panelHeader text="Faces Servlet"/>
     </trh:cellFormat>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml Thu Nov  2 12:07:33 2006
@@ -224,7 +224,7 @@
     </tr:panelGroupLayout>
   </trh:rowLayout>
   <trh:rowLayout>
-    <tr:panelHeader text="ADF Faces Components"/>
+    <tr:panelHeader text="Apache Trinidad Components"/>
     <trh:cellFormat columnSpan="2">
       <tr:panelHeader text="Faces Servlet"/>
     </trh:cellFormat>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml Thu Nov  2 12:07:33 2006
@@ -241,7 +241,7 @@
   </trh:rowLayout>
 
   <trh:rowLayout>
-    <tr:panelHeader text="ADF Faces Components"/>
+    <tr:panelHeader text="Apache Trinidad Components"/>
     <trh:cellFormat columnSpan="2">
       <tr:panelHeader text="Faces Servlet"/>
     </trh:cellFormat>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Thu Nov  2 12:07:33 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * ADF implementation of AgentFactory.
+ * Trinidad implementation of AgentFactory.
  */
 public class AgentFactoryImpl implements AgentFactory
 {
@@ -95,7 +95,7 @@
     //OracleJDevMobile because in each of these cases we know we have an
     //exact match in the device repository for the agent name.  This is
     //because the jdev design time and ITS runtime have access to the same
-    //device repository as the ADF runtime
+    //device repository as the Trinidad runtime
     //The PDA DT useragent string will be: OracleJDevMobile/PDA/[agentName]
     //The telnet DT and RT useragent string will be:
     //OracleJDevMobile/ITS/[agentName]