You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/04/01 20:56:32 UTC
svn commit: r1087849 - in /myfaces:
core/branches/2.1.x/api/src/main/java/javax/faces/component/html/
core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/
core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/
sh...
Author: lu4242
Date: Fri Apr 1 18:56:31 2011
New Revision: 1087849
URL: http://svn.apache.org/viewvc?rev=1087849&view=rev
Log:
MYFACES-3087 Add h:head and h:body xmlns property
Added:
myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java
myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java
Modified:
myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlBody.java
myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlHead.java
myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlBody.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlBody.java?rev=1087849&r1=1087848&r2=1087849&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlBody.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlBody.java Fri Apr 1 18:56:31 2011
@@ -55,6 +55,7 @@ abstract class _HtmlBody extends UIOutpu
/**
*
+ * @since 2.1.0
* @return
*/
@JSFProperty
Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlHead.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlHead.java?rev=1087849&r1=1087848&r2=1087849&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlHead.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/html/_HtmlHead.java Fri Apr 1 18:56:31 2011
@@ -53,6 +53,7 @@ abstract class _HtmlHead extends UIOutpu
/**
*
+ * @since 2.1.0
* @return
*/
@JSFProperty
Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java?rev=1087849&r1=1087848&r2=1087849&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java Fri Apr 1 18:56:31 2011
@@ -60,6 +60,7 @@ public class HtmlHeadRenderer extends Re
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
HtmlRendererUtils.renderHTMLAttributes(writer, component,
HEAD_PASSTHROUGH_ATTRIBUTES);
+ HtmlRendererUtils.renderHTMLAttribute(writer, component, HTML.XMLNS_ATTR , HTML.XMLNS_ATTR);
}
@Override
Added: myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java?rev=1087849&view=auto
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java (added)
+++ myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlBodyRendererTest.java Fri Apr 1 18:56:31 2011
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.renderkit.html;
+
+import java.io.StringWriter;
+
+import javax.faces.component.html.HtmlBody;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.mock.MockRenderKitFactory;
+import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
+import org.apache.myfaces.test.utils.HtmlRenderedAttr;
+import org.junit.Assert;
+
+/**
+ * @author Leonardo Uribe
+ */
+public class HtmlBodyRendererTest extends AbstractJsfTestCase
+{
+
+ private MockResponseWriter writer ;
+ private HtmlBody body;
+
+ public HtmlBodyRendererTest(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(HtmlBodyRendererTest.class);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ body = new HtmlBody();
+
+ writer = new MockResponseWriter(new StringWriter(), null, null);
+ facesContext.setResponseWriter(writer);
+
+ facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
+ facesContext.getRenderKit().addRenderer(
+ body.getFamily(),
+ body.getRendererType(),
+ new HtmlBodyRenderer());
+
+ facesContext.getAttributes().put("org.apache.myfaces.RENDERED_JSF_JS", Boolean.TRUE);
+ }
+
+ public void tearDown()throws Exception
+ {
+ super.tearDown();
+ writer = null;
+ }
+
+ public void testHtmlPropertyPassTru2() throws Exception
+ {
+ HtmlRenderedAttr[] attrs = {
+ new HtmlRenderedAttr("xmlns")
+ };
+
+ HtmlCheckAttributesUtil.checkRenderedAttributes(
+ body, facesContext, writer, attrs);
+ if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
+ fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ }
+ }
+
+ public void testHtmlPropertyPassTru() throws Exception
+ {
+ HtmlRenderedAttr[] attrs = HtmlCheckAttributesUtil.generateBasicReadOnlyAttrs();
+
+ HtmlCheckAttributesUtil.checkRenderedAttributes(
+ body, facesContext, writer, attrs);
+ if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
+ fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ }
+ }
+
+}
Added: myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java?rev=1087849&view=auto
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java (added)
+++ myfaces/core/branches/2.1.x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlHeadRendererTest.java Fri Apr 1 18:56:31 2011
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.renderkit.html;
+
+import java.io.StringWriter;
+
+import javax.faces.component.html.HtmlHead;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.mock.MockRenderKitFactory;
+import org.apache.myfaces.test.mock.MockResponseWriter;
+import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
+import org.apache.myfaces.test.utils.HtmlRenderedAttr;
+
+/**
+ * @author Leonardo Uribe
+ */
+public class HtmlHeadRendererTest extends AbstractJsfTestCase
+{
+
+ private MockResponseWriter writer ;
+ private HtmlHead head;
+
+ public HtmlHeadRendererTest(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(HtmlHeadRendererTest.class);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ head = new HtmlHead();
+
+ writer = new MockResponseWriter(new StringWriter(), null, null);
+ facesContext.setResponseWriter(writer);
+
+ facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
+ facesContext.getRenderKit().addRenderer(
+ head.getFamily(),
+ head.getRendererType(),
+ new HtmlHeadRenderer());
+
+ facesContext.getAttributes().put("org.apache.myfaces.RENDERED_JSF_JS", Boolean.TRUE);
+ }
+
+ public void tearDown()throws Exception
+ {
+ super.tearDown();
+ writer = null;
+ }
+
+ public void testHtmlPropertyPassTru() throws Exception
+ {
+ HtmlRenderedAttr[] attrs = {
+ new HtmlRenderedAttr("xmlns"),
+ new HtmlRenderedAttr("dir"),
+ new HtmlRenderedAttr("lang"),
+ };
+
+ HtmlCheckAttributesUtil.checkRenderedAttributes(
+ head, facesContext, writer, attrs);
+ if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
+ fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
+ }
+ }
+}
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java?rev=1087849&r1=1087848&r2=1087849&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java Fri Apr 1 18:56:31 2011
@@ -554,6 +554,7 @@ public interface HTML
String SCOPE_ATTR = "scope";
String LABEL_ATTR = "label";
String SELECTED_ATTR = "selected";
+ String XMLNS_ATTR = "xmlns";
//HTML attributes values
String SCOPE_COLGROUP_VALUE = "colgroup";
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java?rev=1087849&r1=1087848&r2=1087849&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java Fri Apr 1 18:56:31 2011
@@ -86,6 +86,7 @@ public class HtmlBodyRendererBase extend
ClientBehaviorEvents.UNLOAD, behaviors, HTML.ONUNLOAD_ATTR);
HtmlRendererUtils.renderHTMLAttributes(writer, component,
HTML.BODY_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttribute(writer, component, HTML.XMLNS_ATTR , HTML.XMLNS_ATTR);
}
else
@@ -94,6 +95,7 @@ public class HtmlBodyRendererBase extend
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
HtmlRendererUtils.renderHTMLAttributes(writer, component,
HTML.BODY_PASSTHROUGH_ATTRIBUTES);
+ HtmlRendererUtils.renderHTMLAttribute(writer, component, HTML.XMLNS_ATTR , HTML.XMLNS_ATTR);
}
}