JBoss Rich Faces SVN: r17328 - root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-27 14:19:39 -0400 (Thu, 27 May 2010)
New Revision: 17328
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
Log:
RF-7887
Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-27 18:18:51 UTC (rev 17327)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-27 18:19:39 UTC (rev 17328)
@@ -83,7 +83,7 @@
.rich-extable-drag{
cursor:e-resize;
position:absolute;
- border-left: '1px dashed #{richSkin.generalTextColor}';
+ border-left: '1px dotted #{richSkin.generalTextColor}';
/*background-color: #848089;*/
width:1px;
display: none;
14 years
- 1
- 0
JBoss Rich Faces SVN: r17327 - in root/ui-sandbox/tables/trunk/ui/src/main: resources/META-INF/resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-27 14:18:51 -0400 (Thu, 27 May 2010)
New Revision: 17327
Added:
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
Removed:
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
RF-7887
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-27 18:18:24 UTC (rev 17326)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-27 18:18:51 UTC (rev 17327)
@@ -62,7 +62,7 @@
@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"),
@ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "extendedDataTable.js"),
- @ResourceDependency(name = "extendedDataTable.css") })
+ @ResourceDependency(name = "extendedDataTable.ecss") })
public class ExtendedDataTableRenderer extends SortingFilteringRowsRenderer implements MetaComponentRenderer {
private static enum PartName {
@@ -327,6 +327,7 @@
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-header", null);
header.encodeAll(context);
writer.endElement(HTML.DIV_ELEM);
@@ -420,6 +421,7 @@
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-footer", null);
footer.encodeAll(context);
writer.endElement(HTML.DIV_ELEM);
@@ -593,20 +595,17 @@
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
writer.startElement(HTML.TR_ELEMENT, component);
- writer.startElement(HTML.TD_ELEM, component);
+ writer.startElement(HTML.TH_ELEM, component);
writer.write(" ");
- writer.endElement(HTML.TD_ELEM);
+ writer.endElement(HTML.TH_ELEM);
writer.endElement(HTML.TR_ELEMENT);
- writer.startElement(HTML.TR_ELEMENT, component);
- writer.startElement(HTML.TD_ELEM, component);
- writer.write(" ");
- writer.endElement(HTML.TD_ELEM);
- writer.endElement(HTML.TR_ELEMENT);
- writer.startElement(HTML.TR_ELEMENT, component);
- writer.startElement(HTML.TD_ELEM, component);
- writer.write(" ");
- writer.endElement(HTML.TD_ELEM);
- writer.endElement(HTML.TR_ELEMENT);
+ for (int i = 0; i < 6; i++) {
+ writer.startElement(HTML.TR_ELEMENT, component);
+ writer.startElement(HTML.TD_ELEM, component);
+ writer.write(" ");
+ writer.endElement(HTML.TD_ELEM);
+ writer.endElement(HTML.TR_ELEMENT);
+ }
writer.endElement(HTML.TABLE_ELEMENT);
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null);
Deleted: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-05-27 18:18:24 UTC (rev 17326)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2010-05-27 18:18:51 UTC (rev 17327)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-.rich-extable{
- overflow: hidden;
- background-color: #FFFFFF;
- border: 1px solid #C4C0C9;
- /*height: 100%;*/
-}
-
-.rich-extable-header {
- background-color : #D4CFC7;
-}
-
-.rich-extable-body{
- overflow-x: hidden;
- overflow-y: auto;
- width: 100%;
-}
-
-.rich-extable-spacer {
- height: 0px;
- font-size: 0px;
- line-height: 0px;
-}
-
-.rich-extable-footer {
- background-color: #CCCCCC;
-}
-
-.rich-extable-footer-align{
- vertical-align: top;
-}
-
-.rich-extable-part{
- overflow: hidden;
-}
-
-.rich-extable-footer-part{
- overflow-x: auto;
- overflow-y: visible;
-}
-
-.rich-extable-resizer-holder {
- left : 0px;
- position: relative;
- height: 0px;
-}
-
-.rich-extable-resizer {
- background-image: url("#{resource['spacer.gif']}");
- cursor:e-resize;
- height:20px; /*TODO*/
- position:absolute;
- left: 100%;
- margin-left: -3px;
- width:6px;
-}
-
-.rich-extable-drag{
- cursor:e-resize;
- position:absolute;
- background-color: #848089;
- width:1px;
- display: none;
-}
-
-.rich-extable-reorder{
- position:absolute;
- border-collapse: collapse;
- display: none;
-}
-
-.rich-extable-reorder td{
- width: 30px;
- height: 10px;
- font-size: 5px;
- border: 1px solid #C4C0C9;
-}
-
-.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{
- height: 20px;
- overflow: hidden;
- border-bottom: 1px solid #C4C0C9;
- border-right: 1px solid #C4C0C9;
-}
-
-.rich-extable-empty-footer-cell{
- border-right: 1px solid #C4C0C9;
- height: 1px;
-}
-
-.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content{
- padding: 2px;
- white-space: nowrap;
-}
-
-.rich-extable-reorder-marker {
- position:absolute;
- height: 9px;
- font-size: 9px;
- width:9px;
- background-image: url("#{resource['reorderMarker.gif']}");
- display: none;
-}
\ No newline at end of file
Copied: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss (from rev 17318, root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.css)
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss (rev 0)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-27 18:18:51 UTC (rev 17327)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+.rich-extable{
+ overflow: hidden;
+ background-color: '#{richSkin.tableBackgroundColor}';
+ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+ /*height: 100%;*/
+}
+
+.rich-extable-header, .rich-extable-table-header {
+ background-color : '#{richSkin.tableHeaderBackgroundColor}';
+}
+
+.rich-extable-table-header {
+ border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+}
+
+.rich-extable-body{
+ overflow-x: hidden;
+ overflow-y: auto;
+ width: 100%;
+}
+
+.rich-extable-spacer {
+ height: 0px;
+ /*font-size: 0px;
+ line-height: 0px;*/
+}
+
+.rich-extable-footer, .rich-extable-table-footer {
+ border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+ background-color: '#{richSkin.tableFooterBackgroundColor}';
+}
+
+.rich-extable-footer-align{
+ vertical-align: top;
+}
+
+.rich-extable-part{
+ overflow: hidden;
+}
+
+.rich-extable-footer-part{
+ overflow-x: auto;
+ overflow-y: visible;
+}
+
+.rich-extable-resizer-holder {
+ left : 0px;
+ position: relative;
+ height: 0px;
+}
+
+.rich-extable-resizer {
+ background-image: url("#{resource['spacer.gif']}");
+ cursor:e-resize;
+ height:20px; /*TODO*/
+ position:absolute;
+ left: 100%;
+ margin-left: -3px;
+ width:6px;
+}
+
+.rich-extable-drag{
+ cursor:e-resize;
+ position:absolute;
+ border-left: '1px dashed #{richSkin.generalTextColor}';
+ /*background-color: #848089;*/
+ width:1px;
+ display: none;
+}
+
+.rich-extable-reorder{
+ position:absolute;
+ border-collapse: collapse;
+ display: none;
+}
+
+.rich-extable-reorder th{
+ width: 20px;
+ height: 5px;
+ font-size: 1px;
+ background-color: '#{richSkin.tableHeaderBackgroundColor}';
+ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+}
+
+.rich-extable-reorder td{
+ width: 20px;
+ height: 5px;
+ font-size: 1px;
+ background-color: '#{richSkin.tableBackgroundColor}';
+ border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+}
+
+.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{
+ height: 20px;
+ overflow: hidden;
+ border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+ border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+}
+
+.rich-extable-empty-footer-cell{
+ border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
+ height: 1px;
+}
+
+.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content, .rich-extable-table-header, .rich-extable-table-footer{
+ padding: 3px 7px;
+ white-space: nowrap;
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size: '#{richSkin.generalSizeFont}';
+}
+
+.rich-extable-header-cell-content, .rich-extable-table-header {
+ font-weight:bold;
+ color : '#{richSkin.tableHeaderTextColor}';
+}
+
+.rich-extable-footer-cell-content, .rich-extable-table-footer {
+ font-weight:bold;
+ color: '#{richSkin.generalTextColor}';
+}
+
+.rich-extable-cell-content {
+ color: '#{richSkin.generalTextColor}';
+}
+
+.rich-extable-reorder-marker {
+ position:absolute;
+ height: 9px;
+ font-size: 9px;
+ width:9px;
+ background-image: url("#{resource['reorderMarker.gif']}");
+ display: none;
+}
\ No newline at end of file
14 years
- 1
- 0
JBoss Rich Faces SVN: r17326 - in root: core/trunk/impl/src/main/resources/META-INF/resources and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-05-27 14:18:24 -0400 (Thu, 27 May 2010)
New Revision: 17326
Added:
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractParameter.java
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractPoll.java
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AbstractParameterHandler.java
Modified:
root/core/trunk/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java
root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
root/core/trunk/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js
root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java
Log:
Implement poll and param components, RF-7653, RF-7982
Modified: root/core/trunk/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java
===================================================================
--- root/core/trunk/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java 2010-05-27 16:16:11 UTC (rev 17325)
+++ root/core/trunk/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -35,10 +35,6 @@
public String getStatus();
- public String getSimilarityGroupingId();
-
- public void setSimilarityGroupingId(String similarityGroupingId);
-
public String getOnevent();
public void setOnevent(String onevent);
Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-05-27 16:16:11 UTC (rev 17325)
+++ root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-05-27 18:18:24 UTC (rev 17326)
@@ -339,6 +339,33 @@
};
//
+ var pollTracker = {};
+ richfaces.startPoll = function(options) {
+ var pollId = options.pollId;
+ var interval = options.pollinterval;
+ var ontimer = options.ontimer;
+ richfaces.stopPoll(pollId);
+
+ richfaces.setZeroRequestDelay(options);
+
+ pollTracker[pollId] = window.setTimeout(function(){
+ var pollElement = document.getElementById(pollId);
+ try {
+ ontimer.call(pollElement || window);
+ richfaces.startPoll(options);
+ } catch (e) {
+ // TODO: handle exception
+ }
+ },interval);
+ };
+
+ richfaces.stopPoll = function(id) {
+ if(pollTracker[id]){
+ window.clearTimeout(pollTracker[id]);
+ delete pollTracker[id];
+ }
+ };
+
var pushTracker = {};
richfaces.startPush = function(options) {
@@ -347,7 +374,8 @@
var pushId = options.pushId;
var interval = options.interval;
var ondataavailable = options.ondataavailable;
-
+ richfaces.setZeroRequestDelay(options);
+
richfaces.stopPush(pushId);
pushTracker[pushId] = setTimeout(function() { // TODO: define this function in richfaces object to avoid definition every time when call startPush
@@ -449,6 +477,12 @@
}
}
+ richfaces.setZeroRequestDelay = function(options) {
+ if (typeof options.requestDelay == "undefined") {
+ options.requestDelay = 0;
+ }
+ };
+
var getGlobalStatusNameVariable = function() {
return richfaces.statusName;
}
Modified: root/core/trunk/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js
===================================================================
--- root/core/trunk/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2010-05-27 16:16:11 UTC (rev 17325)
+++ root/core/trunk/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2010-05-27 18:18:24 UTC (rev 17326)
@@ -1,67 +1,11 @@
-{
- var mediaName = "rich-extended-skinning";
-
+(function(jQuery) {
var userAgent = navigator.userAgent;
-
var skipNavigator = window.opera || (userAgent.indexOf('AppleWebKit/') > -1 && userAgent.indexOf('Chrome/') == -1);
if (!skipNavigator) {
-
- var resetMedia = function(elt) {
- var media = elt.getAttribute('media');
-
- if (mediaName == media) {
- elt.removeAttribute('media');
- }
+ var f = function() {
+ jQuery("head > link[media='rich-extended-skinning']").removeAttr('media');
};
-
- if (!window._RICH_FACES_SKINNING_ADDED_TO_BODY) {
- var getElementByTagName = function(elt, name) {
- var elements;
- try {
- elements = elt.selectNodes(".//*[local-name()=\"" +
- name + "\"]");
- } catch (ex) {
- try {
- elements = elt.getElementsByTagName(name);
- } catch (nf) {
- //ok, give up, no elements found
- }
- }
-
- return elements;
- };
-
- var f = function() {
- if (window.RICH_FACES_EXTENDED_SKINNING_ON) {
- var styles = getElementByTagName(document, 'link');
- if (styles) {
- var l = styles.length;
- for (var i = 0; i < l; i++) {
- var elt = styles[i];
- resetMedia(elt);
- }
- }
- }
- };
-
- if (window.addEventListener) {
- window.addEventListener("load", f, false);
- } else {
- window.attachEvent("onload", f);
- }
-
- window._RICH_FACES_SKINNING_ADDED_TO_BODY = true;
- }
-
- if (!window._RICH_FACES_SKINNING_ADDED_TO_AJAX && typeof A4J != "undefined" && A4J.AJAX) {
- A4J.AJAX.AddHeadElementTransformer(function (elt) {
- if (window.RICH_FACES_EXTENDED_SKINNING_ON) {
- if (elt.tagName && elt.tagName.toLowerCase() == 'link') {
- resetMedia(elt);
- }
- }
- });
- window._RICH_FACES_SKINNING_ADDED_TO_AJAX = true;
- }
+ jQuery(document).ready(f);
+ f();
}
-};
+}(jQuery));
\ No newline at end of file
Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-27 16:16:11 UTC (rev 17325)
+++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -54,7 +54,7 @@
.of(ClientBehaviorHint.SUBMITTING));
enum PropertyKeys {
- data, execute, onbeforedomupdate, onbegin, oncomplete, onerror, onevent, queueId, render, similarityGroupingId,
+ data, execute, onbeforedomupdate, onbegin, oncomplete, onerror, onevent, queueId, render,
status, disabled, limitRender, immediate, bypassUpdates
}
@@ -98,8 +98,6 @@
setOnevent((String) value);
} else if (compare(PropertyKeys.queueId, name)) {
setQueueId((String) value);
- } else if (compare(PropertyKeys.similarityGroupingId, name)) {
- setSimilarityGroupingId((String) value);
} else if (compare(PropertyKeys.status, name)) {
setStatus((String) value);
} else if (compare(PropertyKeys.disabled, name)) {
@@ -231,14 +229,6 @@
getStateHelper().put(PropertyKeys.render, render);
}
- public String getSimilarityGroupingId() {
- return (String) getStateHelper().eval(PropertyKeys.similarityGroupingId);
- }
-
- public void setSimilarityGroupingId(String similarityGroupingId) {
- getStateHelper().put(PropertyKeys.similarityGroupingId, similarityGroupingId);
- }
-
public String getStatus() {
return (String) getStateHelper().eval(PropertyKeys.status);
}
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractParameter.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractParameter.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractParameter.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -0,0 +1,260 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.component;
+
+import javax.el.ELContext;
+import javax.el.ValueExpression;
+import javax.faces.FacesException;
+import javax.faces.component.UIComponentBase;
+import javax.faces.component.UIParameter;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+
+import org.ajax4jsf.Messages;
+import org.ajax4jsf.component.JavaScriptParameter;
+import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.2 $ $Date: 2007/02/01 15:31:55 $
+ *
+ */
+@JsfComponent(tag = @Tag(name = "param", handler = "org.richfaces.view.facelets.html.AbstractParameterHandler",
+
+generate = false, type = TagType.Facelets))
+public class AbstractParameter extends UIParameter implements ActionListener,
+ JavaScriptParameter {
+ public static final String COMPONENT_TYPE = "org.richfaces.UIParameter";
+ private static String noEscapeAttr = "noEscape";
+
+ /** ********************************************************* */
+
+ /**
+ * Binding for update on ActionEvent
+ */
+ private ValueExpression assignToBinding = null;
+
+ /** ********************************************************* */
+
+ /**
+ * Converter for update value with this parameter
+ */
+ private Converter converter = null;
+
+ /** ********************************************************* */
+
+ /**
+ * Skip quota escaping of parameter value - for substitute JavaScript
+ * exspression on submit
+ */
+ private Boolean noEscape = null;
+
+ public void setAssignToBinding(ValueExpression propertyBinding) {
+ this.assignToBinding = propertyBinding;
+ }
+
+ public ValueExpression getAssignToBinding() {
+ return assignToBinding;
+ }
+
+ public void setConverter(Converter converter) {
+ this.converter = converter;
+ }
+
+ public Converter getConverter() {
+ return converter;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.JavaScriptParameter#setNoEscape(boolean)
+ */
+ public void setNoEscape(boolean noEscape) {
+ this.noEscape = Boolean.valueOf(noEscape);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.ajax.JavaScriptParameter#isNoEscape()
+ */
+ public boolean isNoEscape() {
+ return isValueOrBinding(noEscape, noEscapeAttr);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.event.ActionListener#processAction(javax.faces.event.ActionEvent)
+ */
+ public void processAction(ActionEvent actionEvent)
+ throws AbortProcessingException {
+ FacesContext context = getFacesContext();
+ ELContext elContext = context.getELContext();
+ ValueExpression updateBinding = getAssignToBinding();
+
+ if (updateBinding != null && (!updateBinding.isReadOnly(elContext))) {
+ Object requestValue = context.getExternalContext()
+ .getRequestParameterMap().get(getName());
+
+ if (requestValue != null && requestValue instanceof String) {
+ Class<?> type = updateBinding.getType(elContext);
+ Converter converter = createConverter(context, type);
+
+ if (null != converter) {
+ requestValue = converter.getAsObject(context, this,
+ (String) requestValue);
+ }
+ }
+
+ if (null != requestValue) {
+ updateBinding.setValue(elContext, requestValue);
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.component.UIParameter#getName()
+ */
+ public String getName() {
+ String name = super.getName();
+
+ // If name not set - use clientId. be Careful !
+ if (null == name) {
+ name = getClientId(FacesContext.getCurrentInstance());
+ }
+
+ return name;
+ }
+
+ public Object getValue() {
+ Object value = super.getValue();
+
+ // TODO - perform conversion if converter is present.
+ if (null != value) {
+ Class<?> type = value.getClass();
+ FacesContext context = getFacesContext();
+ Converter converter = createConverter(context, type);
+
+ if (null != converter) {
+ value = converter.getAsString(context, this, value);
+ }
+ }
+
+ return value;
+ }
+
+ /** ********************************************************* */
+
+ /**
+ * @param context
+ * @param type
+ * @return
+ * @throws FacesException
+ */
+ private Converter createConverter(FacesContext context, Class<?> type)
+ throws FacesException {
+ Converter converter = getConverter();
+
+ if (converter == null && type != null && !type.equals(String.class)
+ && !type.equals(Object.class)) {
+ try {
+ converter = context.getApplication().createConverter(type);
+ } catch (Exception e) {
+ throw new FacesException(Messages.getMessage(
+ Messages.NO_CONVERTER_REGISTERED, type.getName()), e);
+ }
+ }
+
+ return converter;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.component.UIComponentBase#restoreState(javax.faces.context.FacesContext)
+ */
+ @Override
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+
+ super.restoreState(context, values[0]);
+
+ // restore fields values
+ assignToBinding = (ValueExpression) UIComponentBase
+ .restoreAttachedState(context, values[1]);
+ noEscape = (Boolean) values[2];
+ converter = (Converter) UIComponentBase.restoreAttachedState(context,
+ values[3]);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.component.UIComponentBase#saveState(javax.faces.context.FacesContext)
+ */
+ @Override
+ public Object saveState(FacesContext context) {
+ Object[] values = new Object[5];
+
+ values[0] = super.saveState(context);
+
+ // save fields values
+ values[1] = UIComponentBase.saveAttachedState(context, assignToBinding);
+ values[2] = noEscape;
+ values[3] = UIComponentBase.saveAttachedState(context, converter);
+
+ return values;
+ }
+
+ /**
+ * @param field -
+ * value of field to get.
+ * @param name -
+ * name of field, to get from ValueBinding
+ * @return boolean value, based on field or valuebinding.
+ */
+ private boolean isValueOrBinding(Boolean field, String name) {
+ if (null != field) {
+ return field.booleanValue();
+ }
+
+ ValueExpression vb = getValueExpression(name);
+
+ if (null != vb) {
+ FacesContext context = getFacesContext();
+ ELContext elContext = context.getELContext();
+
+ return ((Boolean) vb.getValue(elContext)).booleanValue();
+ } else {
+ return false;
+ }
+ }
+}
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractPoll.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractPoll.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractPoll.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -0,0 +1,69 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+
+package org.richfaces.component;
+
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.EventName;
+import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+
+import javax.faces.component.UICommand;
+
+/**
+ * Component for periodically call AJAX events on server ( poll actions )
+ * @author shura
+ *
+ */
+@JsfComponent(
+ tag = @Tag(generate = true, handler = "org.richfaces.view.facelets.html.AjaxPollHandler", type = TagType.Facelets)
+ )
+public abstract class AbstractPoll extends UICommand {
+ public static final String COMPONENT_TYPE = "org.richfaces.Poll";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Poll";
+
+ public static final String TIMER = "timer";
+
+ public static final String ON_TIMER = "ontimer";
+
+ @Attribute(defaultValue = "1000")
+ public abstract int getInterval();
+
+ @Attribute(defaultValue = "true")
+ public abstract boolean isEnabled();
+
+ @Attribute(events = @EventName("begin"))
+ public abstract String getOnbegin();
+
+ @Attribute(events = @EventName("beforedomupdate"))
+ public abstract String getOnbeforedomupdate();
+
+ @Attribute(events = @EventName("complete"))
+ public abstract String getOncomplete();
+
+ @Attribute(events = @EventName(value = TIMER, defaultEvent = true))
+ public abstract String getOntimer();
+
+}
\ No newline at end of file
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -0,0 +1,139 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html;
+
+import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.JSFunctionDefinition;
+import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.renderkit.AjaxEventOptions;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.HandlersChain;
+import org.ajax4jsf.renderkit.RendererBase;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractPoll;
+
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author shura
+ */
+@ResourceDependencies(value = {
+ @ResourceDependency(library = "javax.faces", name = "jsf.js"),
+ @ResourceDependency(name = "jquery.js"),
+ @ResourceDependency(name = "richfaces.js") })
+@JsfRenderer
+public class AjaxPollRenderer extends RendererBase {
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Poll";
+
+ public static final String RENDERER_TYPE = "org.richfaces.PollRenderer";
+ private static final String AJAX_POLL_FUNCTION = "RichFaces.startPoll";
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter,
+ * javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context,
+ UIComponent component) throws IOException {
+ AbstractPoll poll = (AbstractPoll) component;
+ writer.startElement(HTML.SPAN_ELEM, component);
+ writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "display:none;", null);
+ getUtils().encodeId(context, component);
+ getUtils().encodeBeginFormIfNessesary(context, component);
+ // polling script.
+ writer.startElement(HTML.SCRIPT_ELEM, component);
+ writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
+ StringBuffer script = new StringBuffer("\n");
+ if (poll.isEnabled()) {
+ JSFunction function = new JSFunction(AJAX_POLL_FUNCTION);
+ Map<String, Object> options = new HashMap<String, Object>();
+ Integer interval = new Integer(poll.getInterval());
+ options.put("pollinterval", interval);
+ options.put("pollId", component.getClientId(context));
+ HandlersChain handlersChain = new HandlersChain(poll);
+ handlersChain.addInlineHandlerFromAttribute(context, AbstractPoll.ON_TIMER);
+ handlersChain.addBehaviors(context, AbstractPoll.TIMER);
+
+ if (!handlersChain.hasSubmittingBehavior()) {
+ JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(
+ context, poll, AjaxRendererUtils.AJAX_FUNCTION_NAME);
+ AjaxEventOptions eventOptions = AjaxRendererUtils.buildEventOptions(context, poll);
+ if (!eventOptions.isEmpty()) {
+ ajaxFunction.addParameter(eventOptions);
+ }
+ handlersChain.addInlineHandlerAsValue(context, ajaxFunction.toScript());
+ }
+
+ String handler = handlersChain.toScript();
+
+ if (handler != null) {
+ JSFunctionDefinition timerHandler = new JSFunctionDefinition(JSReference.EVENT);
+ timerHandler.addToBody(handler);
+ options.put(AbstractPoll.ON_TIMER,timerHandler);
+ }
+ function.addParameter(options);
+ function.appendScript(script);
+ } else {
+ script.append("RichFaces.stopPoll('").append(component.getClientId(context)).append("')");
+ }
+ script.append(";\n");
+ writer.writeText(script.toString(), null);
+ writer.endElement(HTML.SCRIPT_ELEM);
+ getUtils().encodeEndFormIfNessesary(context, component);
+ writer.endElement(HTML.SPAN_ELEM);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
+ */
+ protected Class<? extends UIComponent> getComponentClass() {
+ // only push component is allowed.
+ return AbstractPoll.class;
+ }
+
+ @Override
+ protected void doDecode(FacesContext context, UIComponent component) {
+ super.doDecode(context, component);
+
+ AbstractPoll poll = (AbstractPoll) component;
+ if (poll.isEnabled()) {
+ Map<String, String> requestParameterMap = context.getExternalContext().getRequestParameterMap();
+ if (requestParameterMap.get(poll.getClientId(context)) != null) {
+ new ActionEvent(poll).queue();
+ }
+ }
+ }
+
+}
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-05-27 16:16:11 UTC (rev 17325)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -60,17 +60,10 @@
public static final String PUSH_INTERVAL_PARAMETER = "A4J.AJAX.Push.INTERVAL";
- public static final String PUSH_WAIT_PARAMETER = "A4J.AJAX.Push.WAIT";
-
- @Deprecated
- public static final String PUSH_URL_PARAMETER = "A4J.AJAX.Push.URL";
-
public static final int DEFAULT_PUSH_INTERVAL = 1000;
public static final int DEFAULT_PUSH_WAIT = Integer.MIN_VALUE;
- private static final String AJAX_PUSH_FUNCTION = "A4J.AJAX.Push";
-
/* (non-Javadoc)
* @see org.ajax4jsf.renderkit.RendererBase#doEncodeEnd(javax.faces.context.ResponseWriter,
* javax.faces.context.FacesContext, javax.faces.component.UIComponent)
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AbstractParameterHandler.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AbstractParameterHandler.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AbstractParameterHandler.java 2010-05-27 18:18:24 UTC (rev 17326)
@@ -0,0 +1,172 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.view.facelets.html;
+
+import javax.faces.component.ActionSource;
+import javax.faces.component.UIComponent;
+import javax.faces.convert.Converter;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagAttributeException;
+
+import org.ajax4jsf.Messages;
+import org.richfaces.component.AbstractParameter;
+
+/**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:23 $
+ *
+ */
+public class AbstractParameterHandler extends ComponentHandler {
+
+ /**
+ * @author shura (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:23 $
+ *
+ */
+ public static class ActionParamMetaRule extends MetaRule {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.tag.SuggestionHandler.SuggestionMetaRule#applyRule(java.lang.String,
+ * com.sun.facelets.tag.TagAttribute,
+ * com.sun.facelets.tag.MetadataTarget)
+ */
+ public Metadata applyRule(String name, TagAttribute attribute,
+ MetadataTarget meta) {
+ if (meta.isTargetInstanceOf(AbstractParameter.class)) {
+ if ("assignTo".equals(name)) {
+ return new AssignToValueBindingMetadata(attribute);
+ } else if ("converter".equals(name)) {
+ if (attribute.isLiteral()) {
+ return new LiteralConverterMetadata(attribute
+ .getValue());
+ } else {
+ return new DynamicConverterMetadata(attribute);
+ }
+
+ }
+ }
+
+ return null;
+ }
+
+ }
+
+ final static class LiteralConverterMetadata extends Metadata {
+
+ private final String converterId;
+
+ public LiteralConverterMetadata(String converterId) {
+ this.converterId = converterId;
+ }
+
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((AbstractParameter) instance).setConverter(ctx.getFacesContext()
+ .getApplication().createConverter(this.converterId));
+ }
+ }
+
+ final static class DynamicConverterMetadata extends Metadata {
+
+ private final TagAttribute attr;
+
+ public DynamicConverterMetadata(TagAttribute attr) {
+ this.attr = attr;
+ }
+
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((AbstractParameter) instance).setConverter((Converter) this.attr
+ .getObject(ctx, Converter.class));
+ }
+ }
+
+ final static class AssignToValueBindingMetadata extends Metadata {
+
+ private final TagAttribute attr;
+
+ public AssignToValueBindingMetadata(TagAttribute attr) {
+ this.attr = attr;
+ }
+
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((AbstractParameter) instance).setAssignToBinding(attr
+ .getValueExpression(ctx, Object.class));
+ }
+ }
+
+ private TagAttribute _assignTo;
+ private TagAttribute _converter;
+
+ /**
+ * @param config
+ */
+ public AbstractParameterHandler(ComponentConfig config) {
+ super(config);
+ _assignTo = getAttribute("assignTo");
+ _converter = getAttribute("converter");
+
+ if (null != _assignTo) {
+ if (_assignTo.isLiteral()) {
+ throw new TagAttributeException(this.tag, this._assignTo,
+ Messages.getMessage(Messages.MUST_BE_EXPRESSION_ERROR));
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.sun.facelets.FaceletHandler#apply(com.sun.facelets.FaceletContext,
+ * javax.faces.component.UIComponent)
+ */
+ public void onComponentCreated(FaceletContext ctx, UIComponent c,
+ UIComponent parent) {
+ if (parent instanceof ActionSource) {
+ if (_assignTo != null) {
+ AbstractParameter al = (AbstractParameter) c;
+ ((ActionSource) parent).addActionListener(al);
+ }
+ }
+ }
+
+ private static final ActionParamMetaRule actionParamMetaRule = new ActionParamMetaRule();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.tag.AjaxComponentHandler#createMetaRuleset(java.lang.Class)
+ */
+ protected MetaRuleset createMetaRuleset(Class type) {
+ MetaRuleset metaRules = super.createMetaRuleset(type);
+ metaRules.addRule(actionParamMetaRule);
+ return metaRules;
+ }
+
+}
14 years
- 1
- 0
JBoss Rich Faces SVN: r17325 - root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-27 12:16:11 -0400 (Thu, 27 May 2010)
New Revision: 17325
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
Log:
correction in simple table
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-27 15:56:24 UTC (rev 17324)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-27 16:16:11 UTC (rev 17325)
@@ -92,22 +92,22 @@
<tbl:columnGroup>
<tbl:column>Totals</tbl:column>
<tbl:column>
- <h:outputText value="#{report.expReport.totalMeals}">
+ <h:outputText value="#{reportBean.expReport.totalMeals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</tbl:column>
<tbl:column>
- <h:outputText value="#{report.expReport.totalHotels}">
+ <h:outputText value="#{reportBean.expReport.totalHotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</tbl:column>
<tbl:column>
- <h:outputText value="#{report.expReport.totalTransport}">
+ <h:outputText value="#{reportBean.expReport.totalTransport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</tbl:column>
<tbl:column>
- <h:outputText value="#{report.expReport.grandTotal}">
+ <h:outputText value="#{reportBean.expReport.grandTotal}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</tbl:column>
14 years
- 1
- 0
JBoss Rich Faces SVN: r17324 - in root: archetypes and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-05-27 11:56:24 -0400 (Thu, 27 May 2010)
New Revision: 17324
Modified:
root/archetypes/pom.xml
root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
root/pom.xml
Log:
https://jira.jboss.org/browse/RF-8647
* module archetypes added to the root pom
* fixed name of archetype
Modified: root/archetypes/pom.xml
===================================================================
--- root/archetypes/pom.xml 2010-05-27 15:50:20 UTC (rev 17323)
+++ root/archetypes/pom.xml 2010-05-27 15:56:24 UTC (rev 17324)
@@ -33,7 +33,7 @@
<artifactId>archetypes-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>RichFaces Archetypes Aggregator</name>
+ <name>RichFaces Archetypes: Aggregator</name>
<modules>
<module>richfaces-archetype-simpleapp/trunk</module>
Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-05-27 15:50:20 UTC (rev 17323)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-05-27 15:56:24 UTC (rev 17324)
@@ -7,7 +7,7 @@
<artifactId>richfaces-archetype-simpleapp</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>Archetype for Simple RichFaces 4 Application</name>
+ <name>RichFaces Archetypes: Simple Application</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2010-05-27 15:50:20 UTC (rev 17323)
+++ root/pom.xml 2010-05-27 15:56:24 UTC (rev 17324)
@@ -45,6 +45,7 @@
<!--<module>ui-sandbox</module>-->
<module>examples</module>
<!--<module>doc/${doc.svn.dir}</module>-->
+ <module>archetypes</module>
</modules>
<properties>
@@ -139,4 +140,4 @@
</properties>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
14 years
- 1
- 0
JBoss Rich Faces SVN: r17323 - root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-05-27 11:50:20 -0400 (Thu, 27 May 2010)
New Revision: 17323
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java
Log:
https://jira.jboss.org/browse/RF-8707
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-05-27 15:41:26 UTC (rev 17322)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-05-27 15:50:20 UTC (rev 17323)
@@ -51,6 +51,7 @@
while(components.hasNext()){
encodeColumn(facesContext, writer, (UIColumn)components.next(),rowHolder);
}
+ encodeRowEnd(writer);
}
public RowHolderBase createRowHolder(FacesContext context, UIComponent component) {
14 years
- 1
- 0
JBoss Rich Faces SVN: r17322 - root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-27 11:41:26 -0400 (Thu, 27 May 2010)
New Revision: 17322
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java
Log:
fix checkstyle
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-27 15:12:16 UTC (rev 17321)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-05-27 15:41:26 UTC (rev 17322)
@@ -60,10 +60,10 @@
}
protected void encodeRows(FacesContext facesContext, RowHolderBase rowHolder) {
- rowHolder.getRow().walk(facesContext, this, rowHolder);
+ rowHolder.getRow().walk(facesContext, this, rowHolder);
}
-
- public void processRows(ResponseWriter writer, FacesContext facesContext, UIComponent component, boolean updatePartial) throws IOException{
+
+ public void processRows(ResponseWriter writer, FacesContext facesContext, UIComponent component, boolean updatePartial) throws IOException {
RowHolderBase rowHolder = createRowHolder(facesContext, component);
rowHolder.setPartialUpdate(updatePartial);
@@ -72,7 +72,7 @@
encodeAfterRows(writer, facesContext, rowHolder);
}
-
+
protected void doEncodeChildren(ResponseWriter writer, FacesContext facesContext, UIComponent component) throws IOException {
processRows(writer, facesContext, component, false);
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-27 15:12:16 UTC (rev 17321)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-27 15:41:26 UTC (rev 17322)
@@ -44,17 +44,16 @@
/**
* @author Anton Belevich
- *
*/
-@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"),
+@ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"),
- @ResourceDependency(name= "richfaces-event.js"),@ResourceDependency(name = "richfaces-base-component.js"),
- @ResourceDependency(name = "datatable.js"), @ResourceDependency(name = "datatable.ecss") })
+ @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"),
+ @ResourceDependency(name = "datatable.js"), @ResourceDependency(name = "datatable.ecss")})
public class DataTableRenderer extends AbstractTableRenderer {
public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable)
throws IOException {
-
+
if (dataTable instanceof UIDataTable) {
encodeCaption(writer, context, (UIDataTable) dataTable);
// TODO nick - do we need this element if "columnsWidth" is absent?
@@ -77,22 +76,22 @@
}
}
-
+
public RowHolder createRowHolder(FacesContext context, UIComponent component) {
- return new RowHolder(context, (UIDataTable)component);
+ return new RowHolder(context, (UIDataTable) component);
}
-
+
public void encodeRow(ResponseWriter writer, FacesContext context, RowHolderBase holder) throws IOException {
- RowHolder rowHolder = (RowHolder)holder;
+ RowHolder rowHolder = (RowHolder) holder;
Row row = rowHolder.getRow();
-
- if(!encodeParentTBody((UIDataTable)row)) {
- if(rowHolder.isPartialUpdate()) {
- context.getPartialViewContext().getPartialResponseWriter().startUpdate(((UIDataTable)row).getClientId() +":tb");
+
+ if (!encodeParentTBody((UIDataTable) row)) {
+ if (rowHolder.isPartialUpdate()) {
+ context.getPartialViewContext().getPartialResponseWriter().startUpdate(((UIDataTable) row).getClientId() + ":tb");
}
- encodeTableBodyStart(writer, context, (UIDataTable)row);
+ encodeTableBodyStart(writer, context, (UIDataTable) row);
}
-
+
rowHolder.setRowStart(true);
Iterator<UIComponent> components = row.columns();
@@ -100,50 +99,51 @@
while (components.hasNext()) {
UIComponent child = components.next();
- if(child instanceof Row) {
+ if (child instanceof Row) {
- if(rowHolder.getProcessCell() != 0) {
+ if (rowHolder.getProcessCell() != 0) {
encodeRowEnd(writer);
isTRopen = false;
encodeTableBodyEnd(writer);
- if(rowHolder.isPartialUpdate()) {
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().endUpdate();
}
}
-
+
rowHolder.nextCell();
-
- if(rowHolder.isPartialUpdate()) {
+
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().startUpdate(child.getClientId());
}
child.encodeAll(context);
-
- if(rowHolder.isPartialUpdate()) {
+
+ if (rowHolder.isPartialUpdate()) {
context.getPartialViewContext().getPartialResponseWriter().endUpdate();
}
-
} else if (child instanceof UIColumn) {
encodeColumn(context, writer, (UIColumn) child, rowHolder);
isTRopen = true;
}
}
-
- if(isTRopen){
+
+ if (isTRopen) {
encodeRowEnd(writer);
}
}
-
+
public boolean encodeParentTBody(UIDataTableBase dataTableBase) {
Iterator<UIComponent> iterator = dataTableBase.columns();
while (iterator.hasNext()) {
UIComponent child = iterator.next();
- if (child instanceof Row) return false;
+ if (child instanceof Row) {
+ return false;
+ }
}
return true;
}
-
+
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
if (!shouldProceed(component)) {
return;
@@ -154,25 +154,24 @@
encodeTableFacets(writer, context, dataTable);
}
-
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
if (!shouldProceed(component)) {
return;
}
-
- if(component instanceof UIDataTable) {
+
+ if (component instanceof UIDataTable) {
encodeTableEnd(writer);
- }
+ }
}
protected boolean shouldProceed(UIComponent component) {
- return (component instanceof UIDataTableBase);
+ return component instanceof UIDataTableBase;
}
protected Class<? extends UIComponent> getComponentClass() {
return UIDataTable.class;
}
-
+
public void encodeCaption(ResponseWriter writer, FacesContext context, UIDataTable dataTable) throws IOException {
UIComponent caption = dataTable.getCaption();
@@ -203,20 +202,20 @@
writer.endElement(HTML.CAPTION_ELEMENT);
}
-
+
public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName) {
-
- return ((column instanceof org.richfaces.component.UIColumn && "header".equals(tableFacetName)) ?
- new RichHeaderEncodeStrategy() : new SimpleHeaderEncodeStrategy());
+
+ return (column instanceof org.richfaces.component.UIColumn && "header".equals(tableFacetName))
+ ? new RichHeaderEncodeStrategy() : new SimpleHeaderEncodeStrategy();
}
-
+
protected class RichHeaderEncodeStrategy implements HeaderEncodeStrategy {
public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent component, String facetName) throws IOException {
- org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component;
+ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component;
writer.writeAttribute("id", column.getClientId(context), null);
-
+
boolean sortableColumn = isSortable(column);
if (sortableColumn) {
//TODO :anton -> should component be selfSorted
@@ -226,49 +225,49 @@
}
public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent component, String facetName) throws IOException {
-
- org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component;
- if(isSortable(column)) {
+
+ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component;
+ if (isSortable(column)) {
writer.endElement(HTML.SPAN_ELEM);
}
}
public void encodeSortControls(FacesContext context, ResponseWriter writer, org.richfaces.component.UIColumn column, boolean enableAsc, boolean enableDesc, boolean enableUnsort) throws IOException {
}
-
+
}
public boolean containsThead() {
return true;
}
-
+
public boolean isSortable(UIColumn column) {
- if(column instanceof org.richfaces.component.UIColumn) {
+ if (column instanceof org.richfaces.component.UIColumn) {
//TODO: anton - add check for the "comparator" property
- return ((org.richfaces.component.UIColumn)column).getValueExpression("sortBy") != null;
+ return ((org.richfaces.component.UIColumn) column).getValueExpression("sortBy") != null;
}
return false;
}
public void encodeClientScript(ResponseWriter writer, FacesContext facesContext, UIDataTableBase dataTableBase) throws IOException {
-
- UIDataTable dataTable = (UIDataTable)dataTableBase;
+
+ UIDataTable dataTable = (UIDataTable) dataTableBase;
writer.startElement(HTML.SCRIPT_ELEM, dataTable);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
+
JSFunction function = new JSFunction("new RichFaces.ui.DataTable");
function.addParameter(dataTable.getClientId(facesContext));
Map<String, Object> options = new HashMap<String, Object>();
-
-
+
+
AjaxEventOptions ajaxEventOptions = AjaxRendererUtils.buildEventOptions(facesContext, dataTable);
options.put("ajaxEventOptions", ajaxEventOptions.getParameters());
function.addParameter(options);
-
+
writer.writeText(function.toScript(), null);
writer.endElement(HTML.SCRIPT_ELEM);
}
-
+
public String getTableSkinClass() {
return "rf-dt";
}
@@ -276,15 +275,15 @@
public String getCaptionSkinClass() {
return "rf-dt-cap";
}
-
+
public String getRowSkinClass() {
return "rf-dt-r";
}
-
+
public String getFirstRowSkinClass() {
return "rf-dt-f-r";
}
-
+
public String getCellSkinClass() {
return "rf-dt-c";
}
@@ -292,19 +291,19 @@
public String getHeaderSkinClass() {
return "rf-dt-h";
}
-
+
public String getHeaderFirstSkinClass() {
return "rf-dt-h-f";
}
-
+
public String getHeaderCellSkinClass() {
return "rf-dt-h-c";
}
-
+
public String getColumnHeaderSkinClass() {
return "rf-dt-sh";
}
-
+
public String getColumnHeaderFirstSkinClass() {
return "rf-dt-sh-f";
}
@@ -312,11 +311,11 @@
public String getColumnHeaderCellSkinClass() {
return "rf-dt-sh-c";
}
-
+
public String getColumnFooterSkinClass() {
return "rf-dt-sf";
}
-
+
public String getColumnFooterFirstSkinClass() {
return "rf-dt-sf-f";
}
@@ -336,7 +335,7 @@
public String getFooterCellSkinClass() {
return "rf-dt-f-c";
}
-
+
public String getNoDataClass() {
return "rf-dt-nd-c";
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-05-27 15:12:16 UTC (rev 17321)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-05-27 15:41:26 UTC (rev 17322)
@@ -42,14 +42,6 @@
private boolean startPartialUpdate;
- public boolean isStartPartialUpdate() {
- return startPartialUpdate;
- }
-
- public void setStartPartialUpdate(boolean startPartialUpdate) {
- this.startPartialUpdate = startPartialUpdate;
- }
-
public RowHolder(FacesContext context, Row row) {
this(context, row, 0, true);
}
@@ -61,6 +53,14 @@
this.baseClientId = row.getClientId(context);
}
+ public boolean isStartPartialUpdate() {
+ return startPartialUpdate;
+ }
+
+ public void setStartPartialUpdate(boolean startPartialUpdate) {
+ this.startPartialUpdate = startPartialUpdate;
+ }
+
public String getBaseClientId() {
return baseClientId;
}
14 years
- 1
- 0
JBoss Rich Faces SVN: r17321 - root/ui-sandbox/tables/trunk/api/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-27 11:12:16 -0400 (Thu, 27 May 2010)
New Revision: 17321
Modified:
root/ui-sandbox/tables/trunk/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java
Log:
fix checkstyle
Modified: root/ui-sandbox/tables/trunk/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java
===================================================================
--- root/ui-sandbox/tables/trunk/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-05-27 15:00:36 UTC (rev 17320)
+++ root/ui-sandbox/tables/trunk/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-05-27 15:12:16 UTC (rev 17321)
@@ -34,6 +34,15 @@
private boolean partialUpdate;
+ public RowHolderBase(FacesContext context) {
+ this(context, 0);
+ }
+
+ public RowHolderBase(FacesContext context, int currentRow) {
+ this.context = context;
+ this.currentRow = currentRow;
+ }
+
public boolean isPartialUpdate() {
return partialUpdate;
}
@@ -42,15 +51,6 @@
this.partialUpdate = partialUpdate;
}
- public RowHolderBase(FacesContext context) {
- this(context, 0);
- }
-
- public RowHolderBase(FacesContext context, int currentRow) {
- this.context = context;
- currentRow = 0;
- }
-
public FacesContext getContext() {
return context;
}
14 years
- 1
- 0
JBoss Rich Faces SVN: r17320 - in root: dist/trunk and 19 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-27 11:00:36 -0400 (Thu, 27 May 2010)
New Revision: 17320
Added:
root/ui/iteration/trunk/dist/
root/ui/iteration/trunk/dist/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/
root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/misc/trunk/dist/
root/ui/misc/trunk/dist/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Modified:
root/dist/trunk/pom.xml
root/examples-sandbox/trunk/components/tables/pom.xml
root/examples/pom.xml
root/pom.xml
root/ui/core/trunk/api/pom.xml
root/ui/dist/trunk/pom.xml
root/ui/dist/trunk/richfaces-components-api/pom.xml
root/ui/dist/trunk/richfaces-components-impl/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/iteration/trunk/bom/pom.xml
root/ui/iteration/trunk/datascroller/api/pom.xml
root/ui/iteration/trunk/datascroller/pom.xml
root/ui/iteration/trunk/datascroller/ui/pom.xml
root/ui/misc/trunk/bom/pom.xml
root/ui/misc/trunk/pom.xml
Log:
RF-8461
add iteration and misc to richfaces-components assembler
Modified: root/dist/trunk/pom.xml
===================================================================
--- root/dist/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/dist/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -43,6 +43,8 @@
<!-- call ui assembler -->
<module>../../ui/dist/trunk</module>
+ <!-- for build examples we need some components from sandbox -->
+ <module>../../ui-sandbox/datascroller/trunk</module>
<module>../../examples</module>
</modules>
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/examples/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -119,13 +119,13 @@
<id>jee5</id>
<dependencies>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -41,15 +41,15 @@
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-ui</artifactId>
- </dependency>
<dependency>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>datascroller-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>tables-ui</artifactId>
</dependency>
@@ -78,12 +78,12 @@
<!-- JSF -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -28,29 +28,31 @@
</distributionManagement>
<modules>
- <!-- These trunk settings, and this pom.xml will be removed -->
- <!-- Added bom, parent, for temp integration -->
+ <!-- These trunk settings, and this pom.xml will be removed -->
+ <!-- Added bom, parent, for temp integration -->
<module>build/parent/tags/richfaces-parent-5</module>
<module>build/bom/trunk</module>
<!--<module>build/resources/trunk/checkstyle</module>-->
<module>commons/${commons.svn.dir}</module>
<module>core/${core.svn.dir}</module>
- <module>cdk/${cdk.svn.dir}</module>
+ <module>cdk/${cdk.svn.dir}</module>
+
+ <!-- richfaces ui -->
<module>ui/core/${ui.core.svn.dir}</module>
<module>ui/iteration/${ui.iteration.svn.dir}</module>
<module>ui/misc/${ui.misc.svn.dir}</module>
+
<!--<module>ui-sandbox</module>-->
<module>examples</module>
- <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>-->
<!--<module>doc/${doc.svn.dir}</module>-->
</modules>
- <properties>
- <snapshotRepository>
- dav:https://repository.jboss.org/nexus/content/repositories/snapshots/
- </snapshotRepository>
- </properties>
-
+ <properties>
+ <snapshotRepository>
+ dav:https://repository.jboss.org/nexus/content/repositories/snapshots/
+ </snapshotRepository>
+ </properties>
+
<profiles>
<profile>
<id>trunk</id>
@@ -72,10 +74,10 @@
<profile>
<id>sandbox</id>
- <modules>
- <module>ui-sandbox</module>
- <module>examples-sandbox/${examples-sandbox.svn.dir}</module>
- </modules>
+ <modules>
+ <module>ui-sandbox</module>
+ <module>examples-sandbox/${examples-sandbox.svn.dir}</module>
+ </modules>
</profile>
<profile>
@@ -85,13 +87,13 @@
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>2.2-beta-4</version>
<executions>
<execution>
<configuration>
@@ -120,20 +122,21 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>sonar</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <sonar.jdbc.url>jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8</sonar.jdbc.url>
- <sonar.jdbc.driver>com.mysql.jdbc.Driver</sonar.jdbc.driver>
- <sonar.jdbc.username>sonar</sonar.jdbc.username>
- <sonar.jdbc.password>sonar</sonar.jdbc.password>
- <sonar.host.url>http://localhost:9000</sonar.host.url>
- </properties>
- </profile>
+ <profile>
+ <id>sonar</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <sonar.jdbc.url>jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8
+ </sonar.jdbc.url>
+ <sonar.jdbc.driver>com.mysql.jdbc.Driver</sonar.jdbc.driver>
+ <sonar.jdbc.username>sonar</sonar.jdbc.username>
+ <sonar.jdbc.password>sonar</sonar.jdbc.password>
+
+ <sonar.host.url>http://localhost:9000</sonar.host.url>
+ </properties>
+ </profile>
</profiles>
</project>
\ No newline at end of file
Modified: root/ui/core/trunk/api/pom.xml
===================================================================
--- root/ui/core/trunk/api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/core/trunk/api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -54,6 +54,7 @@
<dependency>
<groupId>${jsf2.api.groupid}</groupId>
<artifactId>${jsf2.api.artifactid}</artifactId>
+ <version>2.0.2</version><!-- TODO: remove this dependency it should inherited from perent poms -->
<scope>provided</scope>
</dependency>
<dependency>
Modified: root/ui/dist/trunk/pom.xml
===================================================================
--- root/ui/dist/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/dist/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -36,13 +36,9 @@
<name>Richfaces UI Assembler</name>
<modules>
- <module>../../core/trunk</module>
- <module>../../misc/trunk</module>
- <module>../../../ui-sandbox/tables/trunk</module>
-
<!-- aggregate modules -->
<module>richfaces-components-api</module>
- <module>richfaces-components-impl</module>
+ <!--<module>richfaces-components-impl</module>-->
<module>richfaces-components-ui</module>
</modules>
@@ -54,44 +50,19 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>js</finalName>
- <descriptor>assembler.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>collect-jsdocs</id>
- <phase>process-sources</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <executions>
- <execution>
- <id>jsdoc</id>
- <phase>prepare-package</phase>
- <configuration>
- <outputBaseDirectory>${basedir}/richfaces-components-ui/target/site</outputBaseDirectory>
- <jsDir>${basedir}/target/js</jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- <goals>
- <goal>jsdoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>build-force</id>
+
+ <modules>
+ <module>../../core/trunk</module>
+ <module>../../misc/trunk/dist</module>
+ <module>../../iteration/trunk/dist</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -35,29 +35,26 @@
<packaging>jar</packaging>
<name>Richfaces UI Components API</name>
+ <properties>
+ <assembly.projects.group>org.richfaces.ui</assembly.projects.group>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-bom</artifactId>
+ <artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-api</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-api</artifactId>
</dependency>
<!-- for javadoc generation -->
@@ -74,12 +71,12 @@
<artifactId>richfaces-commons-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.cdk</groupId>
@@ -111,34 +108,6 @@
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- tests -->
- <dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-test-stage</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -156,8 +125,7 @@
<configuration>
<artifactSet>
<includes>
- <include>org.richfaces.ui:*</include>
- <include>org.richfaces.ui-sandbox:*</include>
+ <include>${assembly.projects.group}:*</include>
</includes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>
@@ -166,6 +134,26 @@
</executions>
</plugin>
<plugin>
+ <!-- unpack necessary dependencies for collecting javadocs -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+
+ <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<executions>
@@ -176,14 +164,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <!-- switch on dependency-driven aggregation -->
- <includeDependencySources>true</includeDependencySources>
-
- <dependencySourceIncludes>
- <!-- exclude ONLY commons-cli artifacts -->
- <dependencySourceInclude>org.richfaces.ui:*</dependencySourceInclude>
- <dependencySourceInclude>org.richfaces.ui-sandbox:*</dependencySourceInclude>
- </dependencySourceIncludes>
+ <sourcepath>${basedir}/target/dependency</sourcepath>
</configuration>
</execution>
</executions>
Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -74,12 +74,12 @@
<artifactId>richfaces-commons-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.cdk</groupId>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -35,6 +35,10 @@
<packaging>jar</packaging>
<name>Richfaces UI Components UI</name>
+ <properties>
+ <assembly.projects.group>org.richfaces.ui</assembly.projects.group>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -45,15 +49,15 @@
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-bom</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-bom</artifactId>
+ <artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
@@ -62,6 +66,7 @@
</dependencyManagement>
<dependencies>
+ <!-- artifacts for aggregation -->
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-core-api</artifactId>
@@ -71,8 +76,8 @@
<artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-ui</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-ui</artifactId>
</dependency>
<!-- for javadoc generation -->
@@ -89,12 +94,12 @@
<artifactId>richfaces-commons-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.cdk</groupId>
@@ -126,34 +131,6 @@
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- tests -->
- <dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-test-stage</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -181,6 +158,64 @@
</executions>
</plugin>
<plugin>
+ <!-- unpack necessary dependencies for collecting jsdoc and javadocs -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+
+ <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting jsdoc -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jsdoc</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputBaseDirectory>${basedir}/target</outputBaseDirectory>
+ <jsDir>${basedir}/target/dependency</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ <goals>
+ <goal>jsdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- pack jsdoc to jar -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-jsodcs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classesDirectory>${basedir}/target/jsdoc</classesDirectory>
+ <classifier>jsdoc</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting javadoc -->
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<executions>
@@ -191,14 +226,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <!-- switch on dependency-driven aggregation -->
- <includeDependencySources>true</includeDependencySources>
-
- <dependencySourceIncludes>
- <!-- exclude ONLY commons-cli artifacts -->
- <dependencySourceInclude>org.richfaces.ui:*</dependencySourceInclude>
- <dependencySourceInclude>org.richfaces.ui-sandbox:*</dependencySourceInclude>
- </dependencySourceIncludes>
+ <sourcepath>${basedir}/target/dependency</sourcepath>
</configuration>
</execution>
</executions>
Modified: root/ui/iteration/trunk/bom/pom.xml
===================================================================
--- root/ui/iteration/trunk/bom/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/iteration/trunk/bom/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -51,6 +51,18 @@
</dependency>
<dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- TODO remove when shade plugin will be ready -->
+ <dependency>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>datascroller-api</artifactId>
<version>${project.version}</version>
@@ -60,11 +72,6 @@
<artifactId>datascroller-ui</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
Modified: root/ui/iteration/trunk/datascroller/api/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/api/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/iteration/trunk/datascroller/api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -36,17 +36,6 @@
<packaging>jar</packaging>
<dependencies>
- <!-- runtime -->
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-api</artifactId>
- </dependency>
- <dependency>
- <!-- todo remove this dependency or move to test scope -->
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- </dependency>
-
<!-- JSF with dependencies -->
<dependency>
<groupId>${jsf2.api.groupid}</groupId>
Modified: root/ui/iteration/trunk/datascroller/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/iteration/trunk/datascroller/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -29,7 +29,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>5</version>
- </parent>
+ </parent>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>datascroller-aggregator</artifactId>
Modified: root/ui/iteration/trunk/datascroller/ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -37,7 +37,17 @@
<packaging>jar</packaging>
<dependencies>
+ <!-- runtime -->
<dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- todo remove this dependency or move to test scope -->
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
@@ -46,6 +56,7 @@
<dependency>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>datascroller-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- JSF with dependencies -->
Added: root/ui/iteration/trunk/dist/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/pom.xml (rev 0)
+++ root/ui/iteration/trunk/dist/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Iteration Assembler</name>
+
+ <modules>
+ <!-- aggregate modules -->
+ <module>richfaces-ui-iteration-api</module>
+ <module>richfaces-ui-iteration-ui</module>
+ </modules>
+</project>
\ No newline at end of file
Added: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml (rev 0)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-api</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Richfaces UI Iteration API</name>
+
+ <properties>
+ <assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- artifacts for aggregation -->
+ <dependency>
+ <groupId>${assembly.projects.group}</groupId>
+ <artifactId>datascroller-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- artifacts for javadoc generation -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${assembly.projects.group}:*</include>
+ </includes>
+ </artifactSet>
+ <createSourcesJar>true</createSourcesJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- unpack necessary dependencies for collecting javadocs -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+
+ <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <sourcepath>${basedir}/target/dependency</sourcepath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Added: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml (rev 0)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Richfaces UI Iteration UI</name>
+
+ <properties>
+ <assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- artifacts for aggregation -->
+ <dependency>
+ <groupId>${assembly.projects.group}</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- artifacts for javadoc generation -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${assembly.projects.group}:*</include>
+ </includes>
+ </artifactSet>
+ <createSourcesJar>true</createSourcesJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- unpack necessary dependencies for collecting jsdoc and javadocs -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+
+ <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting jsdoc -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jsdoc</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputBaseDirectory>${basedir}/target</outputBaseDirectory>
+ <jsDir>${basedir}/target/dependency</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ <goals>
+ <goal>jsdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- pack jsdoc to jar -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-jsodcs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classesDirectory>${basedir}/target/jsdoc</classesDirectory>
+ <classifier>jsdoc</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting javadoc -->
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <sourcepath>${basedir}/target/dependency</sourcepath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/bom/pom.xml
===================================================================
--- root/ui/misc/trunk/bom/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/misc/trunk/bom/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -51,16 +51,6 @@
</dependency>
<dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>functions-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>componentcontrol-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
<version>${project.version}</version>
Added: root/ui/misc/trunk/dist/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/pom.xml (rev 0)
+++ root/ui/misc/trunk/dist/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Misc Assembler</name>
+
+ <modules>
+ <!-- aggregate modules -->
+ <module>richfaces-ui-misc-ui</module>
+ </modules>
+</project>
\ No newline at end of file
Added: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml (rev 0)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>5</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Richfaces UI Misc UI</name>
+
+ <properties>
+ <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- artifacts for aggregation -->
+ <dependency>
+ <groupId>${assembly.projects.group}</groupId>
+ <artifactId>componentcontrol-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${assembly.projects.group}</groupId>
+ <artifactId>functions-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- artifacts for javadoc generation -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${assembly.projects.group}:*</include>
+ </includes>
+ </artifactSet>
+ <createSourcesJar>true</createSourcesJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- unpack necessary dependencies for collecting jsdoc and javadocs -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+
+ <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting jsdoc -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jsdoc</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputBaseDirectory>${basedir}/target</outputBaseDirectory>
+ <jsDir>${basedir}/target/dependency</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ <goals>
+ <goal>jsdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- pack jsdoc to jar -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-jsodcs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classesDirectory>${basedir}/target/jsdoc</classesDirectory>
+ <classifier>jsdoc</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- collecting javadoc -->
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <sourcepath>${basedir}/target/dependency</sourcepath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-05-27 14:55:42 UTC (rev 17319)
+++ root/ui/misc/trunk/pom.xml 2010-05-27 15:00:36 UTC (rev 17320)
@@ -41,6 +41,9 @@
<module>parent</module>
<module>functions</module>
<module>componentcontrol</module>
+
+ <!-- assembler -->
+ <module>dist</module>
</modules>
<build>
14 years
- 1
- 0
JBoss Rich Faces SVN: r17319 - root/core/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-05-27 10:55:42 -0400 (Thu, 27 May 2010)
New Revision: 17319
Modified:
root/core/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
https://jira.jboss.org/browse/RF-8676
Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/core/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-05-27 14:40:53 UTC (rev 17318)
+++ root/core/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-05-27 14:55:42 UTC (rev 17319)
@@ -1,6 +1,6 @@
/**
* @fileOverview jQuery setPosition Plugin to place elements on the page
- * @author Pavel Yaschenko
+ * @author Pavel Yaschenko, 05.2010
* @version 0.5
*/
@@ -260,14 +260,14 @@
rect.height = rect.height || 0;
var left = parseInt(element.css('left'),10);
- if (isNaN(left)) {
+ if (isNaN(left) || left==0) {
left = 0;
element.css('left', '0px');
}
if (isNaN(rect.left)) rect.left = left;
var top = parseInt(element.css('top'),10);
- if (isNaN(top)) {
+ if (isNaN(top) || top==0) {
top = 0;
element.css('top', '0px');
}
@@ -287,7 +287,6 @@
}
// jQuery does not support to get offset for hidden elements
- // TODO add qunit test
var hideElement=false;
var eVisibility;
var e;
14 years
- 1
- 0