You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/09/15 20:37:18 UTC
svn commit: r446677 - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/custom/aliasbean/
core/src/main/resources-facesconfig/META-INF/
examples/simple/src/main/webapp/WEB-INF/
Author: weber
Date: Fri Sep 15 11:37:17 2006
New Revision: 446677
URL: http://svn.apache.org/viewvc?view=rev&rev=446677
Log:
TOMAHAWK-80 (AliasBean doesn't need the renderer)
prepare AliasBean for the upcomming commons.jar
Removed:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBeanRenderer.java
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java
myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/faces-config.xml
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java?view=diff&rev=446677&r1=446676&r2=446677
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/aliasbean/AliasBean.java Fri Sep 15 11:37:17 2006
@@ -20,6 +20,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,7 +62,6 @@
public static final String COMPONENT_TYPE = "org.apache.myfaces.AliasBean";
public static final String COMPONENT_FAMILY = "javax.faces.Data";
- private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.AliasBean";
private Alias alias;
private boolean scopeSearched = false;
@@ -71,7 +71,6 @@
public AliasBean()
{
- setRendererType(DEFAULT_RENDERER_TYPE);
alias = new Alias(this);
}
@@ -80,6 +79,10 @@
return COMPONENT_FAMILY;
}
+ public String getRendererType() {
+ return null;
+ }
+
/**
* Define the "fictive" name which will be visible to the children
* of this component as an alias to the "real" object specified
@@ -251,7 +254,17 @@
removeAlias(context);
}
- public void queueEvent(FacesEvent event)
+
+ public void encodeBegin(FacesContext context) throws IOException {
+ makeAlias(context);
+ }
+
+
+ public void encodeEnd(FacesContext context) throws IOException {
+ removeAlias();
+ }
+
+ public void queueEvent(FacesEvent event)
{
super.queueEvent(new FacesEventWrapper(event, this));
}
Modified: myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml?view=diff&rev=446677&r1=446676&r2=446677
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources-facesconfig/META-INF/faces-config.xml Fri Sep 15 11:37:17 2006
@@ -27,7 +27,7 @@
<!-- This PhaseListener is only necessary if the autoscroll feature is used -->
<phase-listener>org.apache.myfaces.renderkit.html.util.AutoScrollPhaseListener</phase-listener>
</lifecycle>
-
+
<!-- MyFaces extended standard components (in alphabetical order) -->
<component>
@@ -158,21 +158,21 @@
<component-class>org.apache.myfaces.custom.buffer.Buffer</component-class>
</component>
- <component>
- <component-type>org.apache.myfaces.Document</component-type>
- <component-class>org.apache.myfaces.custom.document.Document</component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.DocumentHead</component-type>
- <component-class>org.apache.myfaces.custom.document.DocumentHead</component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.DocumentBody</component-type>
- <component-class>org.apache.myfaces.custom.document.DocumentBody</component-class>
- </component>
-
+ <component>
+ <component-type>org.apache.myfaces.Document</component-type>
+ <component-class>org.apache.myfaces.custom.document.Document</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.DocumentHead</component-type>
+ <component-class>org.apache.myfaces.custom.document.DocumentHead</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.DocumentBody</component-type>
+ <component-class>org.apache.myfaces.custom.document.DocumentBody</component-class>
+ </component>
+
<component>
<component-type>org.apache.myfaces.Div</component-type>
<component-class>org.apache.myfaces.custom.div.Div</component-class>
@@ -416,21 +416,21 @@
<render-kit>
<render-kit-id>HTML_BASIC</render-kit-id>
- <!-- overrides to make the dummyForm stuff work with jsf h: components too
-
- <renderer>
- <component-family>javax.faces.Command</component-family>
- <renderer-type>javax.faces.Button</renderer-type>
- <renderer-class>org.apache.myfaces.renderkit.html.jsf.ExtendedHtmlButtonRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Command</component-family>
- <renderer-type>javax.faces.Link</renderer-type>
- <renderer-class>org.apache.myfaces.renderkit.html.jsf.ExtendedHtmlLinkRenderer</renderer-class>
- </renderer>
- -->
-
+ <!-- overrides to make the dummyForm stuff work with jsf h: components too
+
+ <renderer>
+ <component-family>javax.faces.Command</component-family>
+ <renderer-type>javax.faces.Button</renderer-type>
+ <renderer-class>org.apache.myfaces.renderkit.html.jsf.ExtendedHtmlButtonRenderer</renderer-class>
+ </renderer>
+
+ <renderer>
+ <component-family>javax.faces.Command</component-family>
+ <renderer-type>javax.faces.Link</renderer-type>
+ <renderer-class>org.apache.myfaces.renderkit.html.jsf.ExtendedHtmlLinkRenderer</renderer-class>
+ </renderer>
+ -->
+
<!-- extended standard renderers -->
<renderer>
@@ -558,12 +558,6 @@
<renderer>
<component-family>javax.faces.Data</component-family>
- <renderer-type>org.apache.myfaces.AliasBean</renderer-type>
- <renderer-class>org.apache.myfaces.custom.aliasbean.AliasBeanRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Data</component-family>
<renderer-type>org.apache.myfaces.AliasBeansScope</renderer-type>
<renderer-class>org.apache.myfaces.custom.aliasbean.AliasBeansScopeRenderer</renderer-class>
</renderer>
@@ -574,24 +568,24 @@
<renderer-class>org.apache.myfaces.custom.buffer.BufferRenderer</renderer-class>
</renderer>
- <renderer>
- <component-family>javax.faces.Data</component-family>
- <renderer-type>org.apache.myfaces.Document</renderer-type>
- <renderer-class>org.apache.myfaces.custom.document.DocumentRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Data</component-family>
- <renderer-type>org.apache.myfaces.DocumentHead</renderer-type>
- <renderer-class>org.apache.myfaces.custom.document.DocumentHeadRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Data</component-family>
- <renderer-type>org.apache.myfaces.DocumentBody</renderer-type>
- <renderer-class>org.apache.myfaces.custom.document.DocumentBodyRenderer</renderer-class>
- </renderer>
-
+ <renderer>
+ <component-family>javax.faces.Data</component-family>
+ <renderer-type>org.apache.myfaces.Document</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.document.DocumentRenderer</renderer-class>
+ </renderer>
+
+ <renderer>
+ <component-family>javax.faces.Data</component-family>
+ <renderer-type>org.apache.myfaces.DocumentHead</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.document.DocumentHeadRenderer</renderer-class>
+ </renderer>
+
+ <renderer>
+ <component-family>javax.faces.Data</component-family>
+ <renderer-type>org.apache.myfaces.DocumentBody</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.document.DocumentBodyRenderer</renderer-class>
+ </renderer>
+
<renderer>
<component-family>org.apache.myfaces.Checkbox</component-family>
<renderer-type>org.apache.myfaces.Checkbox</renderer-type>
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=446677&r1=446676&r2=446677
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/faces-config.xml Fri Sep 15 11:37:17 2006
@@ -517,12 +517,6 @@
<renderer>
<component-family>javax.faces.Data</component-family>
- <renderer-type>org.apache.myfaces.AliasBean</renderer-type>
- <renderer-class>org.apache.myfaces.custom.aliasbean.AliasBeanRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Data</component-family>
<renderer-type>org.apache.myfaces.AliasBeansScope</renderer-type>
<renderer-class>org.apache.myfaces.custom.aliasbean.AliasBeansScopeRenderer</renderer-class>
</renderer>