incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r486269 - in /incubator/adffaces/branches/jwaldman-portal/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/ trinidad-api/src/main/java/org/apach...
Date Tue, 12 Dec 2006 18:29:47 GMT
Author: jwaldman
Date: Tue Dec 12 10:29:46 2006
New Revision: 486269

URL: http://svn.apache.org/viewvc?view=rev&rev=486269
Log:
scott's patch; loading configurator in the filter

Modified:
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/GlobalConfigurator.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/PortletExternalContext.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ExternalContextUtils.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/GlobalConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/GlobalConfigurator.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/GlobalConfigurator.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/GlobalConfigurator.java
Tue Dec 12 10:29:46 2006
@@ -75,6 +75,7 @@
             _LOG.severe(e);
             throw e;
           }
+          _LOG.fine("GlobalConfigurator has been created.");
         }
         return config;
       }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/PortletExternalContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/PortletExternalContext.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/PortletExternalContext.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/external/PortletExternalContext.java
Tue Dec 12 10:29:46 2006
@@ -57,15 +57,15 @@
   }
 
   /** Creates a new instance of PortletFacesContextImpl */
-  public PortletExternalContext(final Object portletContext, final Object portletRequest,
-      final Object portletResponse)
+  public PortletExternalContext(final PortletContext portletContext, final PortletRequest
portletRequest,
+      final PortletResponse portletResponse)
   {
     _checkNull(portletContext, "PortletContext");
     assert (portletContext != null);
     
-    _portletContext = (PortletContext) portletContext;
-    _portletRequest = (PortletRequest) portletRequest;
-    _portletResponse = (PortletResponse) portletResponse;
+    _portletContext = portletContext;
+    _portletRequest = portletRequest;
+    _portletResponse = portletResponse;
 
     if (portletRequest != null && portletRequest instanceof ActionRequest)
     {

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ExternalContextUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ExternalContextUtils.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ExternalContextUtils.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ExternalContextUtils.java
Tue Dec 12 10:29:46 2006
@@ -68,7 +68,7 @@
     }
     catch (ClassNotFoundException e)
     {
-      _LOG.warning("A non-ServletRequest was submitted and the portlet JARs are not on the
classpath.  Returning false.");
+      _LOG.warning("A non-servlet request was aubmitted and the portlet JARs are not on the
classpath.  Returning false.");
     }
     return false;    
   }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
Tue Dec 12 10:29:46 2006
@@ -22,9 +22,9 @@
   <!-- you can use EL to get the skin. This allows the skin to change between
        requests. -->
   <skin-family>#{prefs.proxy.skinFamily}</skin-family>
-  
+  <!--
   <output-mode>portlet</output-mode>
-
+  -->
   <!--  Uncomment any of these to enable them -->
   <!-- accessibility-mode>inaccessible</accessibility-mode -->  
 </trinidad-config>

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
Tue Dec 12 10:29:46 2006
@@ -46,7 +46,6 @@
   public FacesContextFactoryImpl(FacesContextFactory factory)
   {
     _factory = factory;
-    _config = GlobalConfigurator.getInstance();
   }
 
   @Override
@@ -58,16 +57,18 @@
       Lifecycle lifecycle)
   {
     FacesContext fc = _factory.getFacesContext(context, request, response, lifecycle);
+    GlobalConfigurator config = GlobalConfigurator.getInstance();
     ExternalContext ec = fc.getExternalContext();
-    if(!_config.isInitialized())
+    
+    if(!config.isInitialized())
     {
-      _config.init(ec);
+      config.init(ec);
     }
     
     //The global configurator will make sure other configurators are run only once
     if(!GlobalConfiguratorImpl.isRequestBegun(ec))
     {
-      _config.beginRequest(ec);
+      config.beginRequest(ec);
       ec.getApplicationMap().put(_CONFIG_IN_CONTEXT, Boolean.TRUE);
     }
     
@@ -288,5 +289,4 @@
   static private final String _CONFIG_IN_CONTEXT = FacesContextFactoryImpl.class.getName()+".CONFIG_IN_CONTEXT";
   static private final String _READY_FOR_CLEANUP = FacesContextFactoryImpl.class.getName()+".CONFIG_READY_FOR_CLEANUP";
   private final FacesContextFactory _factory;
-  private final GlobalConfigurator _config;
 }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
Tue Dec 12 10:29:46 2006
@@ -106,7 +106,9 @@
         // Assume it's not a postback request
         context.getExternalContext().getRequestMap().put(_POSTBACK_KEY,
                                                          Boolean.FALSE);
-        TrinidadFilterImpl.verifyFilterIsInstalled(context);
+        
+        //This check doesn't make sense here
+        //TrinidadFilterImpl.verifyFilterIsInstalled(context);
       }
 
       _createContextIfNecessary(event.getFacesContext());

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
Tue Dec 12 10:29:46 2006
@@ -185,10 +185,7 @@
     String viewId = context.getViewRoot().getViewId();
     String action =
       context.getApplication().getViewHandler().getActionURL(context, viewId);
-    action = context.getExternalContext().encodeActionURL(action);
-
-    rw.writeURIAttribute("action", action, null);
-
+    renderEncodedActionURI(context, "action", action);
     if (supportsTarget(arc))
     {
       rw.writeAttribute("target", getTargetFrame(bean), "targetFrame");

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java?view=diff&rev=486269&r1=486268&r2=486269
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
Tue Dec 12 10:29:46 2006
@@ -16,9 +16,7 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,25 +26,14 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
-
 import javax.faces.model.SelectItem;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-
-import org.apache.myfaces.trinidad.context.FormData;
-import org.apache.myfaces.trinidad.context.RenderingContext;
-
-import org.apache.myfaces.trinidad.component.UIXSelectMany;
-import org.apache.myfaces.trinidad.component.UIXSelectOrder;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectManyShuttle;
+import org.apache.myfaces.trinidad.context.RenderingContext;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidad.skin.Skin;
 import org.apache.myfaces.trinidad.skin.Icon;
-
-import org.apache.myfaces.trinidad.util.IntegerUtils;
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
 
 



Mime
View raw message