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 2010/03/08 16:54:57 UTC
svn commit: r920364 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/java/org/apache/myfaces/scripting/components/
core/core/src/main/resources/META-INF/
examples/myfaces12-example/src/main/webapp/resources/styles/
examples/myfaces20-exampl...
Author: werpu
Date: Mon Mar 8 15:54:57 2010
New Revision: 920364
URL: http://svn.apache.org/viewvc?rev=920364&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-86
taint history component moved into the core package.
Added:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java (with props)
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java (contents, props changed)
- copied, changed from r920345, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java
Removed:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistory.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml
myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
Added: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java?rev=920364&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java (added)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java Mon Mar 8 15:54:57 2010
@@ -0,0 +1,84 @@
+/*
+ * 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.scripting.components;
+
+import javax.el.ValueExpression;
+import javax.faces.component.UIOutput;
+import javax.faces.context.FacesContext;
+import java.util.logging.Logger;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class TaintHistory extends UIOutput {
+
+ static Logger _log = Logger.getLogger(TaintHistory.class.getName());
+
+ static final int DEFAULT_NO_ENTRIES = 10;
+
+ Integer _noEntries;
+ String _filter;
+
+ public TaintHistory() {
+ setRendererType("org.apache.myfaces.scripting.components.TaintHistoryRenderer");
+ }
+
+ public void setNoEntries(Integer entries) {
+ _noEntries = entries;
+ }
+
+ @Override
+ public Object saveState(FacesContext facesContext) {
+ Object values[] = new Object[3];
+ values[0] = super.saveState(facesContext); //To change body of overridden methods use File | Settings | File Templates.
+ values[1] = _noEntries;
+ values[2] = _filter;
+ return values;
+ }
+
+ @Override
+ public void restoreState(FacesContext facesContext, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(facesContext, values[0]);
+ _noEntries = (Integer) values[1];
+ _filter = (String) values[2];
+ }
+
+ public Integer getNoEntries() {
+ if (_noEntries != null) {
+ return _noEntries;
+ }
+ ValueExpression vb = getValueExpression("noEntries");
+ return vb != null ? ((Integer) vb.getValue(getFacesContext().getELContext())) : DEFAULT_NO_ENTRIES;
+ }
+
+ public void setFilter(String filter) {
+ _filter = filter;
+ }
+
+ public String getFilter() {
+ if (_filter != null) {
+ return _filter;
+ }
+ ValueExpression vb = getValueExpression("noEntries");
+ return vb != null ? ((String) vb.getValue(getFacesContext().getELContext())) : null;
+ }
+}
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java (from r920345, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java?p2=myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java&r1=920345&r2=920364&rev=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/TaintHistoryRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java Mon Mar 8 15:54:57 2010
@@ -17,11 +17,10 @@
* under the License.
*/
-package org.apache.myfaces.javaloader.componentTest;
+package org.apache.myfaces.scripting.components;
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.scripting.api.CompilationResult;
-import org.apache.myfaces.scripting.components.CompilerComponent;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
@@ -29,7 +28,6 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.render.FacesRenderer;
import java.io.IOException;
import java.text.DateFormat;
import java.util.Collection;
@@ -42,7 +40,6 @@
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-@FacesRenderer(componentFamily = "javax.faces.Output", rendererType = "org.apache.myfaces.scripting.components.TaintHistoryRenderer")
public class TaintHistoryRenderer extends HtmlTextRendererBase {
static Logger _log = Logger.getLogger(TaintHistoryRenderer.class.getName());
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/TaintHistoryRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml?rev=920364&r1=920363&r2=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml Mon Mar 8 15:54:57 2010
@@ -29,4 +29,11 @@
<renderer-type>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-type>
</component>
</tag>
+ <tag>
+ <tag-name>taintHistory</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.TaintHistory</component-type>
+ <renderer-type>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-type>
+ </component>
+ </tag>
</facelet-taglib>
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml?rev=920364&r1=920363&r2=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml Mon Mar 8 15:54:57 2010
@@ -31,13 +31,23 @@
<component-class>org.apache.myfaces.scripting.components.CompilerComponent</component-class>
</component>
+ <component>
+ <component-type>org.apache.myfaces.scripting.components.TaintHistory</component-type>
+ <component-class>org.apache.myfaces.scripting.components.TaintHistory</component-class>
+ </component>
+
+
<render-kit>
<renderer>
-
<component-family>javax.faces.Output</component-family>
<renderer-type>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-type>
<renderer-class>org.apache.myfaces.scripting.components.CompilerComponentRenderer</renderer-class>
</renderer>
-
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.scripting.components.TaintHistoryRenderer</renderer-class>
+ </renderer>
+
</render-kit>
</faces-config>
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css?rev=920364&r1=920363&r2=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/resources/styles/main.css Mon Mar 8 15:54:57 2010
@@ -57,6 +57,68 @@
background-image: url("../img/gradient2.png");
}
+
+/*==================================================
+ Basic CSS information for our
+ taint history component
+ we do not use the compound
+ css for error and history
+ for readability reasons
+ although we have load
+ of duplication here
+====================================================*/
+
+div.historyBox {
+ width: 820px;
+ heigh: 200px;
+
+ display: block;
+ overflow: auto;
+ border: 1px solid white;
+ color: #dedddd;
+ opacity: 0.92;
+
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ border-radius: 5px;
+
+ padding: 5px;
+ margin-left: 10px;
+
+ background-image: url("../img/gradient2.png");
+ background-repeat: repeat-x;
+}
+
+div.historyBox .line {
+ display: table;
+ width: 780px;
+
+ border: 1px dashed black;
+ background-color: #ccccff;
+ color: black;
+ padding: 5px;
+ margin-top: 10px;
+ margin-left: auto;
+ margin-right: auto;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ border-radius: 5px;
+}
+
+div.historyBox .line .timestamp {
+ width: 120px;
+ float: left;
+ color: red;
+}
+
+div.historyBox .line .changedFile {
+ width: 650px;
+ overflow: hidden;
+ display: block;
+ float: left;
+}
+
/*==================================================
Basic CSS information for our compiler
output component
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml?rev=920364&r1=920363&r2=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml Mon Mar 8 15:54:57 2010
@@ -8,36 +8,60 @@
<h:body>
- <h1> this example tests complex bean relationships for refreshing</h1>
- <h:form id="myForm">
- <!--
- <h:outputScript name="jsf.js" library="javax.faces" target="head"/>
-
-
- <h:inputText value="#{myBean.test}">
- <f:ajax render="#{myBean.bindingMyTest.clientId}" event="keyup"/>
- </h:inputText>
- <h:inputText id="myText" value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
-
-
- <h:outputText value="#{receiver.myBean.hello}" />
- <h:outputText value="#{receiver.myBean.secondaryBean.hello}" />
- -->
-
- <h:inputText value="#{myBean.test}">
- <f:ajax render="myText" event="keyup"/>
- </h:inputText>
- <h:panelGroup id="myText">
- <h:inputText value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
+ <h1> this example tests complex bean relationships for refreshing</h1>
+ <h:form id="myForm">
+ <!--
+ <h:outputScript name="jsf.js" library="javax.faces" target="head"/>
+
+
+ <h:inputText value="#{myBean.test}">
+ <f:ajax render="#{myBean.bindingMyTest.clientId}" event="keyup"/>
+ </h:inputText>
+ <h:inputText id="myText" value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
+
+
+ <h:outputText value="#{receiver.myBean.hello}" />
+ <h:outputText value="#{receiver.myBean.secondaryBean.hello}" />
+ -->
+
+ <script type="text/javascript">
+ //<![CDATA[
+ function onEvent(data) {
+ if (typeof data != "undefined" && typeof data.status != "undefined") {
+ console.debug(data.status)
+ } else {
+ console.debug("undefined data");
+ }
+ }
+ //]]>
+ </script>
+
+ <h:selectOneMenu value="#{myBean.test}">
+ <f:selectItem itemValue="aaa" itemLabel="aaa"/>
+ <f:selectItem itemValue="bbb" itemLabel="bbb"/>
+ <f:ajax render="case1" event="change" />
+ </h:selectOneMenu>
+ <h:outputText id="case1" value="#{myBean.test}"/>
+ <h:commandLink action="complexBean" value="press me"/>
+ <h:inputText value="#{myBean.test}">
+ <f:ajax render="myText myText2" event="keyup"/>
+ </h:inputText>
+ <h:outputText id="bla" value="#{myBean.test}"/>
+ <h:panelGroup id="myText">
+ <h:inputText value="#{myBean.test}" rendered="#{myBean.test eq 'aaa'}" binding="#{myBean.bindingMyTest}"/>
+ </h:panelGroup>
+ <h:panelGroup id="myText2">
+ <h:panelGroup rendered="#{myBean.test eq 'ccc'}">
<script type="text/javascript">
- alert("hello");
+ //<![CDATA[
+ console.debug("blablabla");
+ //]]>
</script>
+ <h:inputText value="#{myBean.test}"/>
</h:panelGroup>
+ </h:panelGroup>
-
- </h:form>
-
-
+ </h:form>
</h:body>
</html>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml?rev=920364&r1=920363&r2=920364&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml Mon Mar 8 15:54:57 2010
@@ -6,7 +6,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<h:head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Myfaces Example Facelets</title>
<link type="text/css" rel="stylesheet" href="#{resource['styles:main.css']}"/>