You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2011/09/29 19:01:02 UTC
svn commit: r1177364 - in /myfaces/portlet-bridge/core/branches/2.0.0-branch:
api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
impl/src/main/resources/META-INF/faces-config.xml
Author: mfreedman
Date: Thu Sep 29 17:01:02 2011
New Revision: 1177364
URL: http://svn.apache.org/viewvc?rev=1177364&view=rev
Log:
Modified GenericFacesPortlet.java so its init no longer sets the logging attribute if there is no setting in the portlet.xml -- this allows subclasses to set directly prior to delegating to our init().
Also corrected a misspelling in the excluded attributes of the faces-config.xml
Modified:
myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/faces-config.xml
Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java?rev=1177364&r1=1177363&r2=1177364&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java Thu Sep 29 17:01:02 2011
@@ -204,9 +204,15 @@ public class GenericFacesPortlet extends
// See if this portlet has enabled informational logging messages
String s = getPortletConfig().getInitParameter(LOGGING_ENABLED);
- Boolean b = Boolean.valueOf(s);
- getPortletContext().setAttribute(Bridge.BRIDGE_PACKAGE_PREFIX + getPortletName() + "." +
+
+ // Only set the context parameter if there is a specific configuration setting in the portlet.xml.
+ // By doing this we allow GFP subclasses to preset the value and not have us override it.
+ if (s != null)
+ {
+ Boolean b = Boolean.valueOf(s);
+ getPortletContext().setAttribute(Bridge.BRIDGE_PACKAGE_PREFIX + getPortletName() + "." +
LOGGING_ENABLED, b);
+ }
// Initialize the bridge as the double lock mechanism used for lazy instantiation doesn't (always) work in Java even if
// declared a volitle -- and the bridge is likely to be used anyway -- so why worry about it
Modified: myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/faces-config.xml?rev=1177364&r1=1177363&r2=1177364&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/branches/2.0.0-branch/impl/src/main/resources/META-INF/faces-config.xml Thu Sep 29 17:01:02 2011
@@ -45,7 +45,7 @@
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.config.dispatch.DispatchResponseConfiguratorImpl.*</bridge:excluded-attribute>
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.context.*</bridge:excluded-attribute>
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener.*</bridge:excluded-attribute>
- <bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.context.FacesContxtFactoryImpl.*</bridge:excluded-attribute>
+ <bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.context.FacesContextFactoryImpl.*</bridge:excluded-attribute>
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.dispatch.*</bridge:excluded-attribute>
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.renderkit.*</bridge:excluded-attribute>
<bridge:excluded-attribute>org.apache.myfaces.trinidadinternal.uinode.*</bridge:excluded-attribute>