incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425966 [1/2] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/agent/ main/java/org/apache/myfaces/trinidadinternal/application/ main/java/org/apach...
Date Thu, 27 Jul 2006 05:48:02 GMT
Author: matzew
Date: Wed Jul 26 22:47:59 2006
New Revision: 425966

URL: http://svn.apache.org/viewvc?rev=425966&view=rev
Log:
IMPL refactoring (part I)

Added:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/AdfFacesFilterImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextTest.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MAdfFacesContext.java
Removed:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/AdfFacesFilterImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextTest.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MAdfFacesContext.java
Modified:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java
    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/CoreRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.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/ppr/PartialPageContext.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/CommandLinkRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.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/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.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-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactory.java Wed Jul 26 22:47:59 2006
@@ -22,7 +22,7 @@
 
 /**
  * Factory to create Agent. Allows implementations to plug in their own agent
- * detection, without having to override AdfFacesContext.
+ * detection, without having to override RequestContext.
  * //@todo: Right now this not public API, but will be when adf faces cofiguration is sorted out
  */
 public interface AgentFactory

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java Wed Jul 26 22:47:59 2006
@@ -18,7 +18,7 @@
 import java.util.Map;
 
 import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import javax.faces.context.FacesContext;
 
@@ -87,7 +87,7 @@
    */
   public static AdfFacesAgent getAgent(FacesContext context)
   {
-    Agent agent = AdfFacesContext.getCurrentInstance().getAgent();
+    Agent agent = RequestContext.getCurrentInstance().getAgent();
     if (agent instanceof AdfFacesAgent)
       return (AdfFacesAgent) agent;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityValue.java Wed Jul 26 22:47:59 2006
@@ -28,7 +28,7 @@
   //an string.intern() on the values read from the file.
  
   //Also string values need to be retained, as need to support
-  //clients accessing the Agent Api (AdfFacesContext object constants 
+  //clients accessing the Agent Api (RequestContext object constants 
   //are internal impl)
   
   //This is a poor man's quick substitute for string.intern().

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/NavigationHandlerImpl.java Wed Jul 26 22:47:59 2006
@@ -19,7 +19,7 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 public class NavigationHandlerImpl extends NavigationHandler
 {
@@ -47,7 +47,7 @@
         // Navigate back to the original root
         context.setViewRoot(oldRoot);
 
-        AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+        RequestContext afc = RequestContext.getCurrentInstance();
 
         // Give ourselves a new page flow scope
         afc.getPageFlowScopeProvider().pushPageFlowScope(context, true);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Wed Jul 26 22:47:59 2006
@@ -42,7 +42,7 @@
 import org.apache.myfaces.trinidadinternal.util.LRUCache;
 import org.apache.myfaces.trinidadinternal.util.SubKeyMap;
 import org.apache.myfaces.trinidadinternal.util.TokenCache;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 
 // Imported only for a String constant - so no runtime dependency
 import com.sun.facelets.FaceletViewHandler;
@@ -591,7 +591,7 @@
       return false;
 
     if (_saveAsToken(context) &&
-        !AdfFacesPhaseListener.isPostback(context))
+        !TrinidadPhaseListener.isPostback(context))
     {
       if (_useApplicationViewCache == null)
       {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Wed Jul 26 22:47:59 2006
@@ -33,13 +33,13 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
 import org.apache.myfaces.trinidad.render.InternalView;
 import org.apache.myfaces.trinidad.util.Service;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextImpl;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 
 /**
  * ViewHandler that adds modification detection to the existing ViewHandler,
@@ -119,7 +119,7 @@
   public String getActionURL(FacesContext context, String viewId)
   {
     String actionURL = _delegate.getActionURL(context, viewId);
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     if (afContext != null)
     {
       actionURL = afContext.getPageResolver().encodeActionURI(actionURL);
@@ -187,16 +187,16 @@
   {
     // If we're being asked to re-run the lifecycle for a "return"
     // event, always restore the "launch view", which was set
-    // over in AdfFacesContextImpl
+    // over in RequestContextImpl
     UIViewRoot launchView = (UIViewRoot)
       context.getExternalContext().getRequestMap().get(
-        AdfFacesContextImpl.LAUNCH_VIEW);
+        RequestContextImpl.LAUNCH_VIEW);
 
     if (launchView != null)
     {
       context.getExternalContext().getRequestMap().remove(
-        AdfFacesContextImpl.LAUNCH_VIEW);
-      AdfFacesPhaseListener.markPostback(context);
+        RequestContextImpl.LAUNCH_VIEW);
+      TrinidadPhaseListener.markPostback(context);
       return launchView;
     }
 
@@ -255,7 +255,7 @@
     // this is a postback request.
     if (result != null)
     {
-      AdfFacesPhaseListener.markPostback(context);
+      TrinidadPhaseListener.markPostback(context);
     }
 
     return result;
@@ -355,13 +355,13 @@
    */
   static private String _getPath(String uri)
   {
-    AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+    RequestContext afc = RequestContext.getCurrentInstance();
     if (afc != null)
     {
       return afc.getPageResolver().getPhysicalURI(uri);
     }
 
-    // No AdfFacesContext?  Just return the URI
+    // No RequestContext?  Just return the URI
     return uri;
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java Wed Jul 26 22:47:59 2006
@@ -27,7 +27,7 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.render.RenderKit;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.context.DialogService;
 import org.apache.myfaces.trinidad.event.LaunchEvent;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
@@ -37,11 +37,11 @@
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 import org.apache.myfaces.trinidadinternal.application.StateManagerImpl;
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 public class DialogServiceImpl extends DialogService
 {
-  public DialogServiceImpl(AdfFacesContextImpl context)
+  public DialogServiceImpl(RequestContextImpl context)
   {
     _context = context;
   }
@@ -231,17 +231,17 @@
     // the AdfFacesFilter to re-execute the faces lifecycle with the
     // new parameters
     Map launchParameters = (Map)
-      poppedView.getAttributes().get(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      poppedView.getAttributes().get(RequestContextImpl.LAUNCH_PARAMETERS);
 
     if (launchParameters != null)
     {
       // Store the parameters and the UIViewRoot for (respectively)
       // AdfFacesFilterImpl and ViewHandlerImpl
-      poppedView.getAttributes().remove(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      poppedView.getAttributes().remove(RequestContextImpl.LAUNCH_PARAMETERS);
 
       Map requestMap = context.getExternalContext().getRequestMap();
-      requestMap.put(AdfFacesContextImpl.LAUNCH_PARAMETERS, launchParameters);
-      requestMap.put(AdfFacesContextImpl.LAUNCH_VIEW, poppedView);
+      requestMap.put(RequestContextImpl.LAUNCH_PARAMETERS, launchParameters);
+      requestMap.put(RequestContextImpl.LAUNCH_VIEW, poppedView);
 
       context.responseComplete();
       _LOG.fine("Returned from dialog and re-executing lifecycle for {0}",
@@ -255,7 +255,7 @@
   public ReturnEvent getReturnEvent(UIComponent source)
   {
     FacesContext context = _getFacesContext();
-    if (AdfFacesFilterImpl.isExecutingDialogReturn(context))
+    if (TrinidadFilterImpl.isExecutingDialogReturn(context))
     {
       Map parameterMap = context.getExternalContext().getRequestParameterMap();
       Object returnParam = parameterMap.get(_RETURN_PARAM);
@@ -401,7 +401,7 @@
       savedRequestParameters.remove("source");
       savedRequestParameters.remove("event");
 
-      sourceRoot.getAttributes().put(AdfFacesContextImpl.LAUNCH_PARAMETERS,
+      sourceRoot.getAttributes().put(RequestContextImpl.LAUNCH_PARAMETERS,
                                      savedRequestParameters);
       pushView(sourceRoot);
 
@@ -460,7 +460,7 @@
       _executeBindings(context, (UIComponent) kids.next());
   }
 
-  private AdfFacesContextImpl _context;
+  private RequestContextImpl _context;
 
 
   /**
@@ -477,7 +477,7 @@
 
     public void launchDialog(boolean useWindow)
     {
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       afContext.getDialogService().launchDialog(
         getViewRoot(),
         getDialogParameters(),

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java Wed Jul 26 22:47:59 2006
@@ -31,7 +31,7 @@
 import javax.faces.render.RenderKit;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 /**
  * Internal class that optimizes retrieval of the RenderKit by caching it
@@ -199,7 +199,7 @@
 
     public void dispatch(String path) throws IOException
     {
-      AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+      RequestContext afc = RequestContext.getCurrentInstance();
       if (afc != null)
       {
         path = afc.getPageResolver().getPhysicalURI(path);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java Wed Jul 26 22:47:59 2006
@@ -19,7 +19,7 @@
 
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
 
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
@@ -43,8 +43,8 @@
     PageFlowScopeMap pageFlowScope = _getPageFlowScope(context);
     if (pageFlowScope == null)
     {
-      AdfFacesContextImpl impl = (AdfFacesContextImpl)
-        AdfFacesContext.getCurrentInstance();
+      RequestContextImpl impl = (RequestContextImpl)
+        RequestContext.getCurrentInstance();
       int lifetime = impl.__getPageFlowScopeLifetime();
       String token = _getToken(context);
       if (token != null)

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java Wed Jul 26 22:47:59 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBeanImpl;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 
-public class AdfFacesContextBean extends FacesBeanImpl
+public class RequestContextBean extends FacesBeanImpl
 {
   static public Type TYPE = new Type();
   static public final PropertyKey PAGE_FLOW_SCOPE_LIFETIME_KEY =

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java Wed Jul 26 22:47:59 2006
@@ -19,8 +19,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContextFactory;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContextFactory;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
 import org.apache.myfaces.trinidad.context.PageResolver;
 
@@ -31,23 +31,23 @@
 /**
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesContextFactoryImpl extends AdfFacesContextFactory
+public class RequestContextFactoryImpl extends RequestContextFactory
 {
-  public AdfFacesContextFactoryImpl()
+  public RequestContextFactoryImpl()
   {
   }
 
-  public AdfFacesContext createContext(Object context,
+  public RequestContext createContext(Object context,
                                        Object request)
   {
-    AdfFacesContextImpl impl =  new AdfFacesContextImpl(_getBean(context));
+    RequestContextImpl impl =  new RequestContextImpl(_getBean(context));
     impl.init(request);
     impl.__setPageResolver(_pageResolver);
     impl.__setPageFlowScopeProvider(_pageFlowScopeProvider);
     return impl;
   }
 
-  private AdfFacesContextBean _getBean(Object context)
+  private RequestContextBean _getBean(Object context)
   {
     if (_bean == null)
     {
@@ -59,7 +59,7 @@
         }
         else
         {
-          _bean = new AdfFacesContextBean();
+          _bean = new RequestContextBean();
         }
 
         // And let's load the PageResolver and PageFlowScopeProvider
@@ -88,7 +88,7 @@
     return _bean;
   }
 
-  private AdfFacesContextBean _bean;
+  private RequestContextBean _bean;
   private PageResolver        _pageResolver;
   private PageFlowScopeProvider _pageFlowScopeProvider;
 

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Wed Jul 26 22:47:59 2006
@@ -35,7 +35,7 @@
 import org.apache.myfaces.trinidad.change.ChangeManager;
 import org.apache.myfaces.trinidad.component.UIXCollection;
 import org.apache.myfaces.trinidad.config.RegionManager;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.context.DialogService;
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.context.PageResolver;
@@ -64,12 +64,12 @@
 import org.apache.myfaces.trinidadinternal.ui.expl.ColorPaletteUtils;
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 /**
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesContextImpl extends AdfFacesContext
+public class RequestContextImpl extends RequestContext
 {
   static public final String LAUNCH_PARAMETERS =
     "org.apache.myfaces.trinidad.PageFlowSourceParameters";
@@ -78,7 +78,7 @@
     "org.apache.myfaces.trinidad.PageFlowSourceView";
 
 
-  public AdfFacesContextImpl(AdfFacesContextBean bean)
+  public RequestContextImpl(RequestContextBean bean)
   {
     _bean = bean;
     _dialogService = new DialogServiceImpl(this);
@@ -144,7 +144,7 @@
   public UploadedFileProcessor getUploadedFileProcessor()
   {
     return (UploadedFileProcessor)
-      _bean.getProperty(AdfFacesContextBean.UPLOADED_FILE_PROCESSOR_KEY);
+      _bean.getProperty(RequestContextBean.UPLOADED_FILE_PROCESSOR_KEY);
   }
 
 
@@ -152,14 +152,14 @@
   {
     FacesContext context = __getFacesContext();
     // First, see if this is definitely not a postback request
-    if (!AdfFacesPhaseListener.isPostback(context))
+    if (!TrinidadPhaseListener.isPostback(context))
       return false;
 
     // Second, see if we are still on the original view root (which
     // the PhaseListener's isPostback() method doesn't look at).
     UIViewRoot originalViewRoot = (UIViewRoot)
       context.getExternalContext().getRequestMap().
-         get(AdfFacesPhaseListener.INITIAL_VIEW_ROOT_KEY);
+         get(TrinidadPhaseListener.INITIAL_VIEW_ROOT_KEY);
 
     // However, we only set the "originalViewRoot" during the afterPhase()
     // of our PhaseListener;  so, if it's null, then we have to asume
@@ -192,25 +192,25 @@
   public boolean isDebugOutput()
   {
     return Boolean.TRUE.equals(
-       _bean.getProperty(AdfFacesContextBean.DEBUG_OUTPUT_KEY));
+       _bean.getProperty(RequestContextBean.DEBUG_OUTPUT_KEY));
   }
 
   public boolean isClientValidationDisabled()
   {
     return Boolean.TRUE.equals(
-       _bean.getProperty(AdfFacesContextBean.CLIENT_VALIDATION_DISABLED_KEY));
+       _bean.getProperty(RequestContextBean.CLIENT_VALIDATION_DISABLED_KEY));
   }
 
   public String getOutputMode()
   {
-    return (String) _bean.getProperty(AdfFacesContextBean.OUTPUT_MODE_KEY);
+    return (String) _bean.getProperty(RequestContextBean.OUTPUT_MODE_KEY);
   }
 
   // get skinFamily; default to minimal if nothing is specified.
   public String getSkinFamily()
   {
     String skinFamily =
-      (String) _bean.getProperty(AdfFacesContextBean.SKIN_FAMILY_KEY);
+      (String) _bean.getProperty(RequestContextBean.SKIN_FAMILY_KEY);
     if (skinFamily == null)
       skinFamily = "minimal";
     return skinFamily;
@@ -219,7 +219,7 @@
   public String getAccessibilityMode()
   {
     String s = (String) _bean.getProperty(
-      AdfFacesContextBean.ACCESSIBILITY_MODE_KEY);
+      RequestContextBean.ACCESSIBILITY_MODE_KEY);
     if (s != null)
       return s;
 
@@ -236,7 +236,7 @@
   public char getNumberGroupingSeparator()
   {
     Character c = (Character) _bean.getProperty(
-      AdfFacesContextBean.NUMBER_GROUPING_SEPARATOR_KEY);
+      RequestContextBean.NUMBER_GROUPING_SEPARATOR_KEY);
     if (c != null)
       return c.charValue();
 
@@ -246,7 +246,7 @@
   public char getDecimalSeparator()
   {
     Character c = (Character) _bean.getProperty(
-      AdfFacesContextBean.DECIMAL_SEPARATOR_KEY);
+      RequestContextBean.DECIMAL_SEPARATOR_KEY);
     if (c != null)
       return c.charValue();
 
@@ -256,7 +256,7 @@
 
   public TimeZone getTimeZone()
   {
-    TimeZone tz = (TimeZone) _bean.getProperty(AdfFacesContextBean.TIME_ZONE_KEY);
+    TimeZone tz = (TimeZone) _bean.getProperty(RequestContextBean.TIME_ZONE_KEY);
     if (tz != null)
       return tz;
 
@@ -345,18 +345,18 @@
 
   public String getCurrencyCode()
   {
-    return (String) _bean.getProperty(AdfFacesContextBean.CURRENCY_CODE_KEY);
+    return (String) _bean.getProperty(RequestContextBean.CURRENCY_CODE_KEY);
   }
 
   public String getOracleHelpServletUrl()
   {
     return (String) _bean.getProperty(
-     AdfFacesContextBean.ORACLE_HELP_SERVLET_URL_KEY);
+     RequestContextBean.ORACLE_HELP_SERVLET_URL_KEY);
   }
 
   public boolean isRightToLeft()
   {
-    Boolean b = (Boolean) _bean.getProperty(AdfFacesContextBean.RIGHT_TO_LEFT_KEY);
+    Boolean b = (Boolean) _bean.getProperty(RequestContextBean.RIGHT_TO_LEFT_KEY);
     if (b != null)
       return b.booleanValue();
 
@@ -515,7 +515,7 @@
   public int getTwoDigitYearStart()
   {
     Integer twoDigitYearStart  = (Integer) _bean.getProperty(
-      AdfFacesContextBean.TWO_DIGIT_YEAR_START);
+      RequestContextBean.TWO_DIGIT_YEAR_START);
 
     if (twoDigitYearStart != null)
       return twoDigitYearStart.intValue();
@@ -550,7 +550,7 @@
   int __getPageFlowScopeLifetime()
   {
     Integer lifetimeObj = (Integer) _bean.getProperty(
-                           AdfFacesContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY);
+                           RequestContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY);
     if (lifetimeObj == null)
       return _DEFAULT_PAGE_FLOW_SCOPE_LIFETIME;
     return lifetimeObj.intValue();
@@ -592,7 +592,7 @@
 
   //
   // Get the FacesContext.  We used to cache the instance, but
-  // in some circumstances the AdfFacesContext was getting reused
+  // in some circumstances the RequestContext was getting reused
   // across multiple FacesServlet invocations, so the caching
   // was more trouble than it was worth.  Re-enable some sort
   // of caching if it proves a performance issue.
@@ -605,7 +605,7 @@
     // to the filter and ask for a pseudo-FacesContext
     if (fContext == null)
     {
-      fContext = AdfFacesFilterImpl.getPseudoFacesContext();
+      fContext = TrinidadFilterImpl.getPseudoFacesContext();
     }
 
     return fContext;
@@ -639,7 +639,7 @@
   }
 
 
-  private AdfFacesContextBean _bean;
+  private RequestContextBean _bean;
   private HelpProvider        _provider;
   private Map                 _partialListeners;
   private Set                 _partialTargets = new HashSet();
@@ -650,7 +650,7 @@
   private PageResolver        _pageResolver;
   private PageFlowScopeProvider _pageFlowScopeProvider;
 
-  //todo: get factory from configuration (else implementations have to provide their own AdfFacesContext)
+  //todo: get factory from configuration (else implementations have to provide their own RequestContext)
   static private final AgentFactory _agentFactory = new AgentFactoryImpl();
 
   // static private final Object _GLOBAL_TRIGGER = new Object();
@@ -661,5 +661,5 @@
     "org.apache.myfaces.trinidad.CHANGE_PERSISTENCE";
 
   static private final ADFLogger _LOG =
-    ADFLogger.createADFLogger(AdfFacesContextImpl.class);
+    ADFLogger.createADFLogger(RequestContextImpl.class);
 }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/AdfFacesPhaseListener.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java Wed Jul 26 22:47:59 2006
@@ -23,21 +23,21 @@
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContextFactory;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContextFactory;
 
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 /**
- * PhaseListener that hacks to ensure that the AdfFacesContext is
+ * PhaseListener that hacks to ensure that the RequestContext is
  * available even if the filter doesn't execute.
  *
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesPhaseListener implements PhaseListener
+public class TrinidadPhaseListener implements PhaseListener
 {
   static public final String CACHED_ADF_FACES_CONTEXT =
-    "org.apache.myfaces.trinidadinternal.context.CachedAdfFacesContext";
+    "org.apache.myfaces.trinidadinternal.context.CachedRequestContext";
 
   /**
    * Returns true if the request might be a postback request.
@@ -70,7 +70,7 @@
     }
 
     // If we've finished up Render Response, or for some other
-    // reason the response is complete, free up the AdfFacesContext
+    // reason the response is complete, free up the RequestContext
     // if we created.
     // Note, however, that this code is *not* bulletproof!  There
     // is nothing stopping an "afterPhase()" listener getting called
@@ -98,7 +98,7 @@
         // Assume it's not a postback request
         context.getExternalContext().getRequestMap().put(_POSTBACK_KEY,
                                                          Boolean.FALSE);
-        AdfFacesFilterImpl.verifyFilterIsInstalled(context);
+        TrinidadFilterImpl.verifyFilterIsInstalled(context);
       }
 
       _createContextIfNecessary(event.getFacesContext());
@@ -120,7 +120,7 @@
   }
 
   //
-  // Create the AdfFacesContext if necessary;  ideally, this is unnecessary
+  // Create the RequestContext if necessary;  ideally, this is unnecessary
   // because our filter will have executed - but if not, deal.
   //
   static private void _createContextIfNecessary(FacesContext fContext)
@@ -130,29 +130,29 @@
       requestMap.get(_CREATED_CONTEXT_KEY);
     if (createdContext == null)
     {
-      AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+      RequestContext context = RequestContext.getCurrentInstance();
       // Let our code know if it has to clean up.
       requestMap.put(_CREATED_CONTEXT_KEY,
                      context == null ? Boolean.TRUE : Boolean.FALSE);
 
       if (context == null)
       {
-        Object cachedAdfFacesContext = requestMap.get(CACHED_ADF_FACES_CONTEXT);
+        Object cachedRequestContext = requestMap.get(CACHED_ADF_FACES_CONTEXT);
         
         // Catch both the null scenario and the 
-        // AdfFacesContext-from-a-different-classloader scenario
-        if (cachedAdfFacesContext instanceof AdfFacesContext)
+        // RequestContext-from-a-different-classloader scenario
+        if (cachedRequestContext instanceof RequestContext)
         {
-          context = (AdfFacesContext) cachedAdfFacesContext;
+          context = (RequestContext) cachedRequestContext;
           context.attach();
         }
         else
         {
-          AdfFacesContextFactory factory = AdfFacesContextFactory.getFactory();
+          RequestContextFactory factory = RequestContextFactory.getFactory();
           if (factory == null)
           {
-            AdfFacesContextFactory.setFactory(new AdfFacesContextFactoryImpl());
-            factory = AdfFacesContextFactory.getFactory();
+            RequestContextFactory.setFactory(new RequestContextFactoryImpl());
+            factory = RequestContextFactory.getFactory();
           }
 
           assert(factory != null);
@@ -166,7 +166,7 @@
   }
 
   //
-  // Release the AdfFacesContext if we created it.
+  // Release the RequestContext if we created it.
   //
   static private void _releaseContextIfNecessary(FacesContext fContext)
   {
@@ -174,7 +174,7 @@
       fContext.getExternalContext().getRequestMap().get(_CREATED_CONTEXT_KEY);
     if (Boolean.TRUE.equals(createdContext))
     {
-      AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+      RequestContext context = RequestContext.getCurrentInstance();
       if (context != null)
         context.release();
     }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/AdfFacesVariableResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java Wed Jul 26 22:47:59 2006
@@ -18,34 +18,34 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.VariableResolver;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 /**
  * VariableResolver decorator used by ADF Faces.
  * <p>
  * @author The Oracle ADF Faces Team
  */
-public class AdfFacesVariableResolver extends VariableResolver
+public class TrinidadVariableResolver extends VariableResolver
 {
   static public final String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope";
 
-  public AdfFacesVariableResolver(VariableResolver decorated)
+  public TrinidadVariableResolver(VariableResolver decorated)
   {
     _decorated = decorated;
   }
 
   public Object resolveVariable(FacesContext context, String name)
   {
-    if (AdfFacesContext.VARIABLE_NAME.equals(name))
+    if (RequestContext.VARIABLE_NAME.equals(name))
     {
-      return AdfFacesContext.getCurrentInstance();
+      return RequestContext.getCurrentInstance();
     }
     // Support both "pageFlowScope" and "processScope"
     // as EL variables to give developers a time to migrate
     else if (PAGE_FLOW_SCOPE_VARIABLE_NAME.equals(name) ||
              "processScope".equals(name))
     {
-      return AdfFacesContext.getCurrentInstance().getPageFlowScope();
+      return RequestContext.getCurrentInstance().getPageFlowScope();
     }
 
     return _decorated.resolveVariable(context, name);

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfComponentHandler.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java Wed Jul 26 22:47:59 2006
@@ -34,9 +34,9 @@
  * @author Adam Winer
  * @version
  */
-public class AdfComponentHandler extends ComponentHandler
+public class TrinidadComponentHandler extends ComponentHandler
 {
-  public AdfComponentHandler(ComponentConfig config) 
+  public TrinidadComponentHandler(ComponentConfig config) 
   {
     super(config);
     if (_markInitialState == null)
@@ -62,7 +62,7 @@
     MetaRuleset m = super.createMetaRuleset(type);
     
     m.addRule(StringArrayPropertyTagRule.Instance);
-    m.addRule(AdfListenersTagRule.Instance);
+    m.addRule(TrinidadListenersTagRule.Instance);
            
     return m;
   }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/AdfListenersTagRule.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java Wed Jul 26 22:47:59 2006
@@ -35,9 +35,9 @@
  * @author Adam Winer
  * =-=AEW REWRITE USING BEANINFO
  */
-final class AdfListenersTagRule extends MetaRule
+final class TrinidadListenersTagRule extends MetaRule
 {
-  public static final MetaRule Instance = new AdfListenersTagRule();
+  public static final MetaRule Instance = new TrinidadListenersTagRule();
 
   private static class ListenerPropertyMetadata extends Metadata
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.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/CoreAdfRenderingContext.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java Wed Jul 26 22:47:59 2006
@@ -29,7 +29,7 @@
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgentImpl;
@@ -60,7 +60,7 @@
   public CoreAdfRenderingContext()
   {
     FacesContext context = FacesContext.getCurrentInstance();
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
 
     _outputMode = afContext.getOutputMode();
     _agent = _initializeAgent(context, afContext.getAgent(), _outputMode);
@@ -139,7 +139,7 @@
       return _localeContext.isRightToLeft();
     }
 
-    return AdfFacesContext.getCurrentInstance().isRightToLeft();
+    return RequestContext.getCurrentInstance().isRightToLeft();
   }
 
   public String getOutputMode()
@@ -203,7 +203,7 @@
     if (_localeContext == null)
     {
       _initializeLocaleContext(FacesContext.getCurrentInstance(),
-                               AdfFacesContext.getCurrentInstance());
+                               RequestContext.getCurrentInstance());
     }
 
     return _localeContext;
@@ -325,9 +325,9 @@
    * SkinFactory that best matches
    * the <skin-family> and current render-kit-id.
    * @param fContext FacesContext
-   * @param context  AdfFacesContext
+   * @param context  RequestContext
    */
-  private void _initializeSkin(AdfFacesContext afContext)
+  private void _initializeSkin(RequestContext afContext)
   {
     String skinFamily = afContext.getSkinFamily();
     String renderKitId = "org.apache.myfaces.trinidad.desktop";
@@ -370,8 +370,8 @@
   {
     // First, get an AdfFacesAgent out of the plain Agent
     // =-=AEW In theory, we should only be getting a plain Agent
-    // out of the AdfFacesContext:  for some reason, we're going
-    // straight to an AdfFacesAgent in AdfFacesContext
+    // out of the RequestContext:  for some reason, we're going
+    // straight to an AdfFacesAgent in RequestContext
     AdfFacesAgent agent;
     if (base instanceof AdfFacesAgent)
       agent = (AdfFacesAgent) base;
@@ -398,7 +398,7 @@
   //
   private void _initializePPR(
     FacesContext    fContext,
-    AdfFacesContext context)
+    RequestContext context)
   {
     // Don't bother if PPR isn't even supported
     if (!CoreRendererUtils.supportsPartialRendering(this))
@@ -456,7 +456,7 @@
 
   private void _initializeLocaleContext(
     FacesContext    fContext,
-    AdfFacesContext context)
+    RequestContext context)
   {
     MutableLocaleContext localeContext = new MutableLocaleContext(
                                    fContext.getViewRoot().getLocale());

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=425966&r1=425965&r2=425966&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 Wed Jul 26 22:47:59 2006
@@ -53,13 +53,13 @@
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.context.Agent;
 
 import org.apache.myfaces.trinidad.render.DialogRenderKitService;
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
 
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 
 import org.apache.myfaces.trinidadinternal.io.DebugResponseWriter;
 import org.apache.myfaces.trinidadinternal.io.DebugHtmlResponseWriter;
@@ -134,9 +134,9 @@
    */
   static public String chooseRenderKit(FacesContext context)
   {
-    AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+    RequestContext afc = RequestContext.getCurrentInstance();
     // According to the spec FacesContext can be null.
-    // In that case AdfFacesContext could also be null.
+    // In that case RequestContext could also be null.
     // bug 4695929:
     if (afc != null)
     {
@@ -163,7 +163,7 @@
   static public void saveDialogPostbackValues(
     String returnId)
   {
-    Map pageFlowScope = AdfFacesContext.getCurrentInstance().getPageFlowScope();
+    Map pageFlowScope = RequestContext.getCurrentInstance().getPageFlowScope();
     pageFlowScope.put(_RETURN_ID, returnId);
   }
 
@@ -204,7 +204,7 @@
       _copyProperty(windowProperties, "height", sourceAttrs, "windowHeight");
     }
 
-    Map pageFlowScope = AdfFacesContext.getCurrentInstance().getPageFlowScope();
+    Map pageFlowScope = RequestContext.getCurrentInstance().getPageFlowScope();
     if (processParameters != null)
       pageFlowScope.putAll(processParameters);
 
@@ -224,7 +224,7 @@
     if (!_supportsSeparateWindow(context))
       return false;
 
-    AdfFacesContext afC = AdfFacesContext.getCurrentInstance();
+    RequestContext afC = RequestContext.getCurrentInstance();
     try
     {
       String returnId = (String) afC.getPageFlowScope().get(_RETURN_ID);
@@ -285,7 +285,7 @@
       Map requestMap = context.getExternalContext().getRequestMap();
 
       UIViewRoot originalRoot = (UIViewRoot) requestMap.get(
-                         AdfFacesPhaseListener.INITIAL_VIEW_ROOT_KEY);
+                         TrinidadPhaseListener.INITIAL_VIEW_ROOT_KEY);
       // If we're doing a partial update, and the page has changed, switch to a
       // full page context.
       if (context.getViewRoot() != originalRoot)
@@ -493,7 +493,7 @@
   static private ResponseWriter _addDebugResponseWriters(
      ResponseWriter responseWriter)
   {
-    AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+    RequestContext adfFacesContext = RequestContext.getCurrentInstance();
     if (adfFacesContext.isDebugOutput())
     {
       responseWriter = new IndentingResponseWriter(responseWriter);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.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/CoreRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java Wed Jul 26 22:47:59 2006
@@ -30,7 +30,7 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 
 /**
  * Basic implementation of the core rendering functionality
@@ -401,7 +401,7 @@
     // The best fix would really be somehow skipping the Apply Request
     // Values phase altogether, while still queueing the ReturnEvent
     // properly.  But how the heck is that gonna happen?
-    return AdfFacesFilterImpl.isExecutingDialogReturn(context);
+    return TrinidadFilterImpl.isExecutingDialogReturn(context);
   }
 
   protected FacesBean getFacesBean(UIComponent component)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.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/desktop/TreeTableRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Wed Jul 26 22:47:59 2006
@@ -33,7 +33,7 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
@@ -100,7 +100,7 @@
       TreeUtils.decodeFocusEvent(parameters, component);
       TreeUtils.decodeGotoEvent(parameters, component);
       // bug 4522210:
-      AdfFacesContext.getCurrentInstance().addPartialTarget(component);
+      RequestContext.getCurrentInstance().addPartialTarget(component);
     }
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.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/CalendarDialogJSP.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Wed Jul 26 22:47:59 2006
@@ -31,7 +31,7 @@
 import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
 import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
@@ -56,7 +56,7 @@
 {
 
   /**
-   * @todo Integrate the time zone with AdfFacesContext (somehow)
+   * @todo Integrate the time zone with RequestContext (somehow)
    */
   static public void service(FacesContext context)
     throws IOException
@@ -202,13 +202,13 @@
         date = new Date();
       }
 
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       afContext.returnFromDialog(date, null);
       return true;
     }
     else if (XhtmlConstants.CANCEL_EVENT.equals(event))
     {
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       afContext.returnFromDialog(null, null);
       return true;
     }
@@ -225,7 +225,7 @@
     String value = (String) requestParams.get(name);
     if (value == null || value.equals(""))
     {
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       Object o = afContext.getPageFlowScope().get(name);
       if (o != null)
         value = o.toString();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.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/FredJSP.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java Wed Jul 26 22:47:59 2006
@@ -26,7 +26,7 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.component.core.CoreImportScript;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
 import org.apache.myfaces.trinidad.component.html.HtmlHtml;

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=425966&r1=425965&r2=425966&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 Wed Jul 26 22:47:59 2006
@@ -29,7 +29,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.render.InternalView;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
@@ -92,7 +92,7 @@
     String entryKey = (String) context.getExternalContext().getRequestParameterMap().get(__ENTRY_KEY_PARAM);
     if (entryKey == null)
     {
-      AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+      RequestContext adfFacesContext = RequestContext.getCurrentInstance();
       if (adfFacesContext != null)
       {
         Object o = adfFacesContext.getPageFlowScope().get(__ENTRY_KEY_PARAM);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.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/ppr/PartialPageContext.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java Wed Jul 26 22:47:59 2006
@@ -22,9 +22,9 @@
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextImpl;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
 
@@ -61,7 +61,7 @@
    * the specified ids.
    */
   public PartialPageContext(
-    AdfFacesContext afContext)
+    RequestContext afContext)
   {
     this();
 
@@ -69,8 +69,8 @@
     // phases (we don't get here until render response). If so, the IDs have
     // been kept on the AdfContext. We'll grab them now and add them to the
     // target list.
-    AdfFacesContextImpl adfContext =
-      (AdfFacesContextImpl) afContext;
+    RequestContextImpl adfContext =
+      (RequestContextImpl) afContext;
     Iterator targetIter = adfContext.getPartialTargets();
     while (targetIter.hasNext())
       _targets.put(targetIter.next(), Boolean.FALSE);

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=425966&r1=425965&r2=425966&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 Wed Jul 26 22:47:59 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.html.HtmlBody;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
@@ -428,7 +428,7 @@
       comment += ", skin:" + skinId;
 
       // Also log preferred Skin if we have one
-      AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+      RequestContext adfFacesContext = RequestContext.getCurrentInstance();
       String preferredSkin = adfFacesContext.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/CommandLinkRenderer.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/CommandLinkRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Wed Jul 26 22:47:59 2006
@@ -26,7 +26,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.nav.CoreCommandLink;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
@@ -47,7 +47,7 @@
 
   public void decode(FacesContext context, UIComponent component)
   {
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     ReturnEvent returnEvent =
       afContext.getDialogService().getReturnEvent(component);
     if (returnEvent != null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.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/FormRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Wed Jul 26 22:47:59 2006
@@ -34,7 +34,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXForm;
 import org.apache.myfaces.trinidad.component.core.CoreForm;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidad.context.Agent;
 
@@ -453,7 +453,7 @@
     boolean hasImmediateComponent = fData.hasImmediateComponent();
 
     boolean isClientValidationDisabled =
-      AdfFacesContext.getCurrentInstance().isClientValidationDisabled();
+      RequestContext.getCurrentInstance().isClientValidationDisabled();
 
     if (isClientValidationDisabled || hasImmediateComponent)
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.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/PartialPageUtils.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java Wed Jul 26 22:47:59 2006
@@ -19,10 +19,10 @@
 
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextBean;
+import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
@@ -41,7 +41,7 @@
 
   public static boolean isPartialRequest(FacesContext context)
   {
-    return AdfFacesContext.getCurrentInstance().isPartialRequest(context);
+    return RequestContext.getCurrentInstance().isPartialRequest(context);
   }
 
 
@@ -58,7 +58,7 @@
 
   public static PartialPageContext createPartialPageContext(
     FacesContext    context,
-    AdfFacesContext afContext)
+    RequestContext afContext)
   {
     if (isPartialRequest(context))
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.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/SelectRangeChoiceBarRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Wed Jul 26 22:47:59 2006
@@ -35,7 +35,7 @@
 import org.apache.myfaces.trinidad.component.UIXSelectItem;
 import org.apache.myfaces.trinidad.component.UIXSelectRange;
 import org.apache.myfaces.trinidad.component.core.data.CoreSelectRangeChoiceBar;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
@@ -88,7 +88,7 @@
         if (choiceBar.isImmediate())
           context.renderResponse();
 
-        AdfFacesContext.getCurrentInstance().addPartialTarget(component);
+        RequestContext.getCurrentInstance().addPartialTarget(component);
       }
     }
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.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/ShowDetailItemRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java Wed Jul 26 22:47:59 2006
@@ -29,7 +29,7 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidad.event.DisclosureEvent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 public class ShowDetailItemRenderer extends XhtmlRenderer
 {
@@ -63,7 +63,7 @@
       {
         boolean isDisclosed = XhtmlConstants.SHOW_EVENT.equals(event);
         (new DisclosureEvent(component, isDisclosed)).queue();
-        AdfFacesContext.getCurrentInstance().addPartialTarget(component);
+        RequestContext.getCurrentInstance().addPartialTarget(component);
       }
     }
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.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/SimpleSelectInputColorRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java Wed Jul 26 22:47:59 2006
@@ -33,7 +33,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputColor;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
@@ -101,7 +101,7 @@
       }
 
 
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
 
       // =-=AEW Parameters?  Shouldn't we pass in the color?
       Map parameters = null;



Mime
View raw message