JBoss Rich Faces SVN: r17297 - root/examples/core-demo/trunk/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 15:18:57 -0400 (Wed, 26 May 2010)
New Revision: 17297
Modified:
root/examples/core-demo/trunk/src/main/webapp/button.xhtml
root/examples/core-demo/trunk/src/main/webapp/link.xhtml
Log:
https://jira.jboss.org/browse/RF-8696
Modified: root/examples/core-demo/trunk/src/main/webapp/button.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/button.xhtml 2010-05-26 19:18:28 UTC (rev 17296)
+++ root/examples/core-demo/trunk/src/main/webapp/button.xhtml 2010-05-26 19:18:57 UTC (rev 17297)
@@ -15,11 +15,12 @@
<h:outputText value="Name:" />
<h:form>
<h:inputText value="#{commandBean.name}" />
- <a4j:commandButton action="#{commandBean.submit}" render="out" value="Say Hello" />
- <a4j:commandButton action="#{commandBean.submit}" render="out" value="Say Hello with limitRender" limitRender="true"/>
- <a4j:commandButton action="#{commandBean.reset}" render="out" value="Reset" />
+ <a4j:commandButton action="#{commandBean.submit}" render="out" value="Say Hello" execute="@form" />
+ <a4j:commandButton action="#{commandBean.submit}" render="out" value="Say Hello with limitRender"
+ limitRender="true" execute="@form" />
+ <a4j:commandButton action="#{commandBean.reset}" render="out" value="Reset" execute="@form" />
<a4j:commandButton value="Test AjaxBehavior">
- <f:ajax event="action" listener="#{commandBean.listener}" />
+ <f:ajax event="action" execute="@form" render=":out" listener="#{commandBean.listener}" />
</a4j:commandButton>
</h:form>
<br />
Modified: root/examples/core-demo/trunk/src/main/webapp/link.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/link.xhtml 2010-05-26 19:18:28 UTC (rev 17296)
+++ root/examples/core-demo/trunk/src/main/webapp/link.xhtml 2010-05-26 19:18:57 UTC (rev 17297)
@@ -15,17 +15,17 @@
<h:outputText value="Name:" />
<h:form>
<h:inputText value="#{commandBean.name}" />
- <a4j:commandLink action="#{commandBean.submit}" render="out">
+ <a4j:commandLink action="#{commandBean.submit}" render="out" execute="@form">
<h:outputText value="Say Hello" />
</a4j:commandLink>
- <a4j:commandLink action="#{commandBean.submit}" render="out" limitRender="true">
+ <a4j:commandLink action="#{commandBean.submit}" render="out" limitRender="true" execute="@form">
<h:outputText value="Say Hello with limitRender" />
</a4j:commandLink>
- <a4j:commandLink action="#{commandBean.reset}" render="out">
+ <a4j:commandLink action="#{commandBean.reset}" render="out" execute="@form">
<h:outputText value="Reset" />
</a4j:commandLink>
<a4j:commandLink>
- <f:ajax event="action" listener="#{commandBean.listener}" />
+ <f:ajax event="action" execute="@form" render=":out" listener="#{commandBean.listener}" />
<h:outputText value="Test AjaxBehavior" />
</a4j:commandLink>
</h:form>
14 years, 1 month
JBoss Rich Faces SVN: r17296 - root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 15:18:28 -0400 (Wed, 26 May 2010)
New Revision: 17296
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java
Log:
https://jira.jboss.org/browse/RF-8696
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java 2010-05-26 19:08:28 UTC (rev 17295)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java 2010-05-26 19:18:28 UTC (rev 17296)
@@ -21,22 +21,25 @@
package org.richfaces.renderkit.html;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.renderkit.RendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.component.AbstractOutputPanel;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
-
/**
* @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:27 $
*/
+@JsfRenderer(type = "org.richfaces.OutputPanelRenderer", family = AbstractOutputPanel.COMPONENT_FAMILY)
public class AjaxOutputPanelRenderer extends RendererBase {
private static final String[] STYLE_ATTRIBUTES = new String[]{"style", "class"};
14 years, 1 month
JBoss Rich Faces SVN: r17295 - 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-26 15:08:28 -0400 (Wed, 26 May 2010)
New Revision: 17295
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-8630
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-26 18:32:43 UTC (rev 17294)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-26 19:08:28 UTC (rev 17295)
@@ -336,31 +336,19 @@
encodeHeaderOrFooter(state, "header");
}
- private void encodeBodyProlog(FacesContext context, UIComponent table, String tableBodyId) throws IOException {
- ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, tableBodyId, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
- }
-
- private void encodeBodyEpilog(FacesContext context) throws IOException {
- ResponseWriter writer = context.getResponseWriter();
- writer.endElement(HTML.DIV_ELEM);
- }
-
public void encodeBody(RendererState state) throws IOException {
FacesContext context = state.getContext();
ResponseWriter writer = context.getResponseWriter();
UIDataTableBase table = state.getRow();
String tableBodyId = table.getClientId(context) + ":b";
-
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, tableBodyId);
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, tableBodyId, null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
if (table.getRowCount() == 0) {
- EncoderVariance encoderVariance = state.getEncoderVariance();
- encoderVariance.encodeStartUpdate(context, tableBodyId);
- encodeBodyProlog(context, table, tableBodyId);
-
UIComponent facet = table.getFacet("noData");
if (facet != null && facet.isRendered()) {
facet.encodeAll(context);
@@ -371,13 +359,8 @@
}
}
- encodeBodyEpilog(context);
- encoderVariance.encodeEndUpdate(context);
-
} else {
- encodeBodyProlog(context, table, tableBodyId);
-
table.getAttributes().put("clientFirst", 0);
writer.startElement(HTML.DIV_ELEM, table);
writer.startElement(HTML.DIV_ELEM, table);
@@ -398,9 +381,6 @@
String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0);
- EncoderVariance encoderVariance = state.getEncoderVariance();
- encoderVariance.encodeStartUpdate(context, targetId);
-
writer.startElement(HTML.TABLE_ELEMENT, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, targetId, null);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
@@ -412,8 +392,6 @@
writer.endElement(HTML.TBODY_ELEMENT);
writer.endElement(HTML.TABLE_ELEMENT);
- encoderVariance.encodeEndUpdate(context);
-
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.TD_ELEM);
}
@@ -421,9 +399,9 @@
writer.endElement(HTML.TBODY_ELEMENT);
writer.endElement(HTML.TABLE_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
-
- encodeBodyEpilog(context);
}
+ writer.endElement(HTML.DIV_ELEM);
+ encoderVariance.encodeEndUpdate(context);
}
public void encodeFooter(RendererState state) throws IOException {
@@ -456,10 +434,9 @@
public void encodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId)
throws IOException {
-
+ UIExtendedDataTable table = (UIExtendedDataTable) component;
if (UIExtendedDataTable.SCROLL.equals(metaComponentId)) {
final PartialResponseWriter writer = context.getPartialViewContext().getPartialResponseWriter();
- UIExtendedDataTable table = (UIExtendedDataTable) component;
int clientFirst = table.getClientFirst();
Integer oldClientFirst = (Integer) table.getAttributes().remove(UIExtendedDataTable.OLD_CLIENT_FIRST);
if (oldClientFirst == null) {
@@ -534,9 +511,8 @@
writer.endEval();
}
writer.startEval();
- //TODO nick - make this utility function in RendererUtils
writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:")
- + "').triggerHandler('rich:onscrollcomplete', " + table.getClientFirst() + ");");
+ + "').triggerHandler('rich:onajaxcomplete', {first: " + table.getClientFirst() + "});");
writer.endEval();
table.setRowKey(context, key);
table.restoreOrigValue(context);
@@ -552,12 +528,22 @@
RendererState state = createRowHolder(context, component);
state.setEncoderVariance(EncoderVariance.partial);
+ PartialResponseWriter writer = context.getPartialViewContext().getPartialResponseWriter();
+
if (UIDataTableBase.HEADER.equals(metaComponentId)) {
encodeHeader(state);
+ writer.startEval();
+ writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:")
+ + "').triggerHandler('rich:onajaxcomplete', {reinitializeHeader: true});");
+ writer.endEval();
} else if (UIDataTableBase.FOOTER.equals(metaComponentId)) {
encodeFooter(state);
} else if (UIDataTableBase.BODY.equals(metaComponentId)) {
encodeBody(state);
+ writer.startEval();
+ writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:")
+ + "').triggerHandler('rich:onajaxcomplete', {first: " + table.getClientFirst() + ", rowCount: " + getRowCount(component)+ ", reinitializeBody: true});");
+ writer.endEval();
} else {
throw new IllegalArgumentException("Unsupported metaComponentIdentifier: " + metaComponentId);
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-26 18:32:43 UTC (rev 17294)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-26 19:08:28 UTC (rev 17295)
@@ -39,27 +39,18 @@
var MIN_WIDTH = 20;
var element = document.getElementById(id);
- var bodyElement = document.getElementById(id + ":b");
- var contentElement = jQuery(bodyElement).children("div:first").get(0);
+ var bodyElement, contentElement, spacerElement, dataTableElement, rows, rowHeight, parts;
var dragElement = document.getElementById(id + ":d");
var reorderElement = document.getElementById(id + ":r");
var reorderMarkerElement = document.getElementById(id + ":rm");
var widthInput = document.getElementById(id + ":wi");
-
var normalPartStyle = richfaces.getCSSRule(".rich-extable-part-width").style;
- var resizerHolders = jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer-holder").get();
+ var header = jQuery(element).children(".rich-extable-header");
+ var resizerHolders = header.find(".rich-extable-resizer-holder").get();
var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader");
var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant;
- if (contentElement) {
- var spacerElement = contentElement.firstChild;//TODO this.marginElement = Richfaces.firstDescendant(this.contentElement);
- var dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);
- var rows = document.getElementById(id + ":body").firstChild.rows.length;//TODO Richfaces.firstDescendant;
- }
-
- var parts = jQuery(element).find(".rich-extable-part");
-
var scrollElement = document.getElementById(id + ":footer");
var resizeData = {};
@@ -153,10 +144,20 @@
};
var initializeLayout = function() {
- //TODO Use "var rowHeight" instead of "dataTableElement.offsetHeight / rows"
+ bodyElement = document.getElementById(id + ":b");
+ contentElement = jQuery(bodyElement).children("div:first").get(0);
if (contentElement) {
- contentElement.style.height = (rowCount * dataTableElement.offsetHeight / rows) + "px";
+ spacerElement = contentElement.firstChild;//TODO this.marginElement = Richfaces.firstDescendant(this.contentElement);
+ dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);
+ rows = document.getElementById(id + ":body").firstChild.rows.length;//TODO Richfaces.firstDescendant;
+ rowHeight = dataTableElement.offsetHeight / rows;
+ contentElement.style.height = (rowCount * rowHeight) + "px";
+ jQuery(bodyElement).bind("scroll", bodyScrollListener);
+ } else {
+ spacerElement = null;
+ dataTableElement = null;
}
+ parts = jQuery(element).find(".rich-extable-part");
updateLayout();
updateScrollPosition(); //TODO Restore horizontal scroll position
};
@@ -210,7 +211,7 @@
var beginReorder = function(event) {
idOfReorderingColumn = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
jQuery(document).bind("mousemove", reorder);
- jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").bind("mouseover", overReorder);
+ header.find(".rich-extable-header-cell").bind("mouseover", overReorder);
jQuery(document).one("mouseup", cancelReorder);
return false;
};
@@ -234,7 +235,7 @@
jQuery(this).unbind("mouseout", outReorder);
var id = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
var colunmsOrder = "";
- jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").each(function() {
+ header.find(".rich-extable-header-cell").each(function() {
var i = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
if (i == id) {
colunmsOrder += idOfReorderingColumn + "," + id + ",";
@@ -247,12 +248,12 @@
var cancelReorder = function(event) {
jQuery(document).unbind("mousemove", reorder);
- jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").unbind("mouseover", overReorder);
+ header.find(".rich-extable-header-cell").unbind("mouseover", overReorder);
reorderElement.style.display = "none";
};
var loadData = function(event) {
- var clientFirst = Math.round((bodyElement.scrollTop + bodyElement.clientHeight / 2) / (dataTableElement.offsetHeight / rows) - rows / 2);
+ var clientFirst = Math.round((bodyElement.scrollTop + bodyElement.clientHeight / 2) / (rowHeight) - rows / 2);
if (clientFirst <= 0) {
clientFirst = 0;
} else {
@@ -271,29 +272,37 @@
}
};
- var scrollComplete = function (event, first) {
- spacerElement.style.height = (first * dataTableElement.offsetHeight / rows) + "px";
-// TODO var height = first * dataTableElement.offsetHeight / rows;
-// var style = spacerElement.style;
-// style.height = height + "px";
-// style.display = height ? "block" : "";
+ var ajaxComplete = function (event, data) {
+ if (data.reinitializeHeader) {
+ bindHeaderHandlers();
+ } else {
+ if (data.reinitializeBody) {
+ rowCount = data.rowCount;
+ initializeLayout();
+ }
+ if (spacerElement) {
+ spacerElement.style.height = (data.first * rowHeight) + "px";
+ }
+ }
};
jQuery(document).ready(initializeLayout);
jQuery(window).bind("resize", updateLayout);
jQuery(scrollElement).bind("scroll", updateScrollPosition);
- //TODO nick - use end() or alike functions
- jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer").bind("mousedown", beginResize);
- jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").bind("mousedown", beginReorder);
+ var bindHeaderHandlers = function () {
+ header.find(".rich-extable-resizer").bind("mousedown", beginResize);
+ header.find(".rich-extable-header-cell").bind("mousedown", beginReorder);
+ }
+ bindHeaderHandlers();
jQuery(bodyElement).bind("scroll", bodyScrollListener);
- jQuery(element).bind("rich:onscrollcomplete", scrollComplete);
+ jQuery(element).bind("rich:onajaxcomplete", ajaxComplete);
//JS API
element.component = this;
this.getColumnPosition = function(id) {
var position;
- var headers = jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell");
+ var headers = header.find(".rich-extable-header-cell");
for (var i = 0; i < headers.length; i++) {
if (id == headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]) {
position = i;
@@ -305,7 +314,7 @@
this.setColumnPosition = function(id, position) {
var colunmsOrder = "";
var before;
- var headers = jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell");
+ var headers = header.find(".rich-extable-header-cell");
for (var i = 0; i < headers.length; i++) {
var current = headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
if (i == position) {
14 years, 1 month
JBoss Rich Faces SVN: r17294 - root/build/resources/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-26 14:32:43 -0400 (Wed, 26 May 2010)
New Revision: 17294
Modified:
root/build/resources/trunk/clean_install.sh
Log:
Made cdk build part of primary build
Modified: root/build/resources/trunk/clean_install.sh
===================================================================
--- root/build/resources/trunk/clean_install.sh 2010-05-26 18:22:28 UTC (rev 17293)
+++ root/build/resources/trunk/clean_install.sh 2010-05-26 18:32:43 UTC (rev 17294)
@@ -8,7 +8,6 @@
This script will execute "mvn clean install" on all modules in RichFaces 4.0. With the the various options below.
MODULE OPTIONS
- -c Include cdk modules
-t Include tests, and docs modules (NOT FUNCTIONAL)
-e Include examples, and archetype modules (NOT FUNCTIONAL)
-s Include sandbox modules
@@ -47,11 +46,6 @@
FINAL_LIST=( ${MAIN_MODULE_ARRAY[@]} )
-if [ "$INCL_CDK" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${CDK_MODULE_ARRAY[@]} )
-fi
-
if [ "$INCL_DOCS_TESTS" -eq "1" ]
then
FINAL_LIST=( ${FINAL_LIST[@]} ${DOC_QE_MODULE_ARRAY[@]} )
@@ -96,7 +90,6 @@
SKIP_ENFORCE=0
MVNARGS=
WORK=1
-INCL_CDK=0
INCL_DOCS_TESTS=0
INCL_EXAMPLES_ARCHETYPE=0
INCL_SANDBOX=0
@@ -108,6 +101,7 @@
"build/bom/trunk"
"build/resources/trunk/checkstyle"
"commons/trunk"
+ "cdk/trunk"
"core/trunk"
"ui/core/trunk"
"ui/misc/trunk"
@@ -115,12 +109,6 @@
# TODO NOT SURE WHAT TO DO WITH /DISTS
)
-CDK_MODULE_ARRAY=(
- "cdk/trunk"
- #"cdk-sandbox/trunk/xsd2javadoc"
- #"cdk-sandbox/trunk/maven-resource-dependency-plugin"
- )
-
DOC_QE_MODULE_ARRAY=(
# "docs/trunk"
# "tests/trunk"
@@ -164,7 +152,7 @@
# "ui-sandbox/tree-model"
)
-while getopts "tecsahd:xy" OPTION
+while getopts "tesahd:xy" OPTION
do
case $OPTION in
t)
@@ -173,14 +161,10 @@
e)
INCL_EXAMPLES_ARCHETYPE=1
;;
- c)
- INCL_CDK=1
- ;;
s)
INCL_SANDBOX=1
;;
a)
- INCL_CDK=1
INCL_DOCS_TESTS=1
INCL_EXAMPLES_ARCHETYPE=1
INCL_SANDBOX=1
14 years, 1 month
JBoss Rich Faces SVN: r17293 - in root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo: tables and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-26 14:22:28 -0400 (Wed, 26 May 2010)
New Revision: 17293
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/UserBean.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/ReportBean.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java
Log:
checkstyle corrections
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/UserBean.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/UserBean.java 2010-05-26 18:16:47 UTC (rev 17292)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/UserBean.java 2010-05-26 18:22:28 UTC (rev 17293)
@@ -2,7 +2,6 @@
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
-import javax.faces.bean.ViewScoped;
@ManagedBean(name = "userBean")
@SessionScoped
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/ReportBean.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/ReportBean.java 2010-05-26 18:16:47 UTC (rev 17292)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/ReportBean.java 2010-05-26 18:22:28 UTC (rev 17293)
@@ -8,15 +8,16 @@
@ManagedBean
@RequestScoped
public class ReportBean {
- ExpenseReport expReport;
+ ExpenseReport expReport;
- public ExpenseReport getExpReport() {
- if (expReport == null)
- expReport = new ExpenseReport();
- return expReport;
- }
+ public ExpenseReport getExpReport() {
+ if (expReport == null) {
+ expReport = new ExpenseReport();
+ }
+ return expReport;
+ }
- public void setExpReport(ExpenseReport expReport) {
- this.expReport = expReport;
- }
+ public void setExpReport(ExpenseReport expReport) {
+ this.expReport = expReport;
+ }
}
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java 2010-05-26 18:16:47 UTC (rev 17292)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java 2010-05-26 18:22:28 UTC (rev 17293)
@@ -3,15 +3,6 @@
public class ExpenseReportRecordItem {
private String city;
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
private String day;
private double meals;
private double hotels;
@@ -25,6 +16,14 @@
this.transport = transport;
}
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
public String getDay() {
return day;
}
14 years, 1 month
JBoss Rich Faces SVN: r17292 - in root/examples/richfaces-showcase/trunk/src/main: java/org/richfaces/demo/tables/model/expenses and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-26 14:16:47 -0400 (Wed, 26 May 2010)
New Revision: 17292
Added:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
Removed:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/data/
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/report/
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java
root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
Log:
https://jira.jboss.org/browse/RF-8290
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java 2010-05-26 18:11:01 UTC (rev 17291)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java 2010-05-26 18:16:47 UTC (rev 17292)
@@ -5,22 +5,22 @@
import java.util.List;
public class ExpenseReport {
- private List records = null;
+ private List<ExpenseReportRecord> records = null;
- public List getRecords() {
+ public List<ExpenseReportRecord> getRecords() {
if (records == null) {
initRecords();
}
return records;
}
- public void setRecords(List records) {
+ public void setRecords(List<ExpenseReportRecord> records) {
this.records = records;
}
public double getTotalMeals() {
double ret = 0.0;
- Iterator it = getRecords().iterator();
+ Iterator<ExpenseReportRecord> it = getRecords().iterator();
while (it.hasNext()) {
ExpenseReportRecord record = (ExpenseReportRecord) it.next();
ret += record.getTotalMeals();
@@ -30,7 +30,7 @@
public double getTotalHotels() {
double ret = 0.0;
- Iterator it = getRecords().iterator();
+ Iterator<ExpenseReportRecord> it = getRecords().iterator();
while (it.hasNext()) {
ExpenseReportRecord record = (ExpenseReportRecord) it.next();
ret += record.getTotalHotels();
@@ -40,7 +40,7 @@
public double getTotalTransport() {
double ret = 0.0;
- Iterator it = getRecords().iterator();
+ Iterator<ExpenseReportRecord> it = getRecords().iterator();
while (it.hasNext()) {
ExpenseReportRecord record = (ExpenseReportRecord) it.next();
ret += record.getTotalTransport();
@@ -57,7 +57,7 @@
}
private void initRecords() {
- records = new ArrayList();
+ records = new ArrayList<ExpenseReportRecord>();
ExpenseReportRecord rec;
rec = new ExpenseReportRecord();
rec.setCity("San Jose");
@@ -69,9 +69,6 @@
rec.getItems().add(new ExpenseReportRecordItem("27-Aug-97", 96.25, 109.0, 36.00, "Seattle"));
rec.getItems().add(new ExpenseReportRecordItem("28-Aug-97", 35.0, 109.0, 36.0, "Seattle"));
records.add(rec);
- rec = new ExpenseReportRecord();
- rec.setCity("new");
- records.add(rec);
}
}
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java 2010-05-26 18:11:01 UTC (rev 17291)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java 2010-05-26 18:16:47 UTC (rev 17292)
@@ -6,7 +6,7 @@
public class ExpenseReportRecord {
private String city;
- private List items = new ArrayList();
+ private List<ExpenseReportRecordItem> items = new ArrayList<ExpenseReportRecordItem>();
public String getCity() {
return city;
@@ -16,17 +16,17 @@
this.city = city;
}
- public List getItems() {
+ public List<ExpenseReportRecordItem> getItems() {
return this.items;
}
- public void setItems(List items) {
+ public void setItems(List<ExpenseReportRecordItem> items) {
this.items = items;
}
public double getTotalMeals() {
double ret = 0.0;
- Iterator it = items.iterator();
+ Iterator<ExpenseReportRecordItem> it = items.iterator();
while (it.hasNext()) {
ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next();
ret += item.getMeals();
@@ -36,7 +36,7 @@
public double getTotalHotels() {
double ret = 0.0;
- Iterator it = items.iterator();
+ Iterator<ExpenseReportRecordItem> it = items.iterator();
while (it.hasNext()) {
ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next();
ret += item.getHotels();
@@ -46,7 +46,7 @@
public double getTotalTransport() {
double ret = 0.0;
- Iterator it = items.iterator();
+ Iterator<ExpenseReportRecordItem> it = items.iterator();
while (it.hasNext()) {
ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next();
ret += item.getTransport();
Modified: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-26 18:11:01 UTC (rev 17291)
+++ root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-26 18:16:47 UTC (rev 17292)
@@ -186,10 +186,16 @@
<name>Data Table Styling</name>
<description>
<!-- TODO: rowClass should appears at this sample after completion -->
- <!-- TODO: rowClasses should be used instead of jQuerry selectors after will works -->
- <!-- TODO: onrowmouseover, onrowmouseout - should be used instead of jQuery selector -->
+ <!--
+ TODO: rowClasses should be used instead of jQuerry selectors
+ after will works
+ -->
+ <!--
+ TODO: onrowmouseover, onrowmouseout - should be used instead of
+ jQuery selector
+ -->
</description>
- </sample>
+ </sample>
<sample>
<id>tableSorting</id>
<name>Data Table Sorting</name>
@@ -223,7 +229,21 @@
<name>Table Basic Usage</name>
</sample>
</samples>
- </demo>
+ </demo>
+ <demo>
+ <id>dataScroller</id>
+ <name>rich:dataScroller</name>
+ <samples>
+ <sample>
+ <id>simpleScrolling</id>
+ <name>DataScroller Basic Usage</name>
+ </sample>
+ <sample>
+ <id>dataScrollerCustomization</id>
+ <name>DataScroller Customization</name>
+ </sample>
+ </samples>
+ </demo>
</demos>
</group>
</root>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-26 18:11:01 UTC (rev 17291)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-26 18:16:47 UTC (rev 17292)
@@ -14,10 +14,11 @@
</f:metadata>
</ui:define>
<ui:define name="body">
- <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s">
+ <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status">
<h:link value="#{s.name}" includeViewParams="true">
<f:param name="sample" value="#{s.id}" />
</h:link>
+ <h:outputText value="CUR" style="color:orange" rendered="#{(s.id == sample) or (status.index==0 and sample=='')}"/>
<h:outputText value=" | " />
</ui:repeat>
<fieldset><legend>#{demoNavigator.currentSample.name}</legend>
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml 2010-05-26 18:16:47 UTC (rev 17292)
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:tbl="http://richfaces.org/rich"
+ xmlns:ds="http://richfaces.org/datascroller"
+ >
+
+<ui:composition>
+ <h:form id="form">
+ <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ id="table" rows="10">
+ <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <f:facet name="header">
+ <h:outputText value="Vendor " />
+ </f:facet>
+ <h:outputText value="#{car.vendor}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Model" />
+ </f:facet>
+ <h:outputText value="#{car.model}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="#{car.price}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{car.mileage}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="VIN " />
+ </f:facet>
+ <h:outputText value="#{car.vin}" />
+ </tbl:column>
+ <f:facet name="footer">
+ <ds:dataScroller/>
+ </f:facet>
+ </tbl:dataTable>
+ </h:form>
+</ui:composition>
+
+</html>
\ No newline at end of file
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-26 18:16:47 UTC (rev 17292)
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:tbl="http://richfaces.org/rich"
+ xmlns:ds="http://richfaces.org/datascroller"
+ >
+
+<ui:composition>
+ <h:form id="form">
+ <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ id="table" rows="10">
+ <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <f:facet name="header">
+ <h:outputText value="Vendor " />
+ </f:facet>
+ <h:outputText value="#{car.vendor}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Model" />
+ </f:facet>
+ <h:outputText value="#{car.model}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="#{car.price}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{car.mileage}" />
+ </tbl:column>
+ <tbl:column>
+ <f:facet name="header">
+ <h:outputText value="VIN " />
+ </f:facet>
+ <h:outputText value="#{car.vin}" />
+ </tbl:column>
+ <f:facet name="footer">
+ <ds:dataScroller/>
+ </f:facet>
+ </tbl:dataTable>
+ </h:form>
+</ui:composition>
+
+</html>
\ No newline at end of file
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-26 18:11:01 UTC (rev 17291)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-26 18:16:47 UTC (rev 17292)
@@ -46,11 +46,6 @@
</f:facet>
</tbl:column>
<tbl:column>
- <f:facet name="header">
- <h:outputText value="#{record.totalMeals}">
- <f:convertNumber pattern="$####.00" />
- </h:outputText>
- </f:facet>
<h:outputText value="#{expense.meals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
14 years, 1 month
JBoss Rich Faces SVN: r17291 - root/ui-sandbox.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 14:11:01 -0400 (Wed, 26 May 2010)
New Revision: 17291
Removed:
root/ui-sandbox/componentcontrol/
Modified:
root/ui-sandbox/pom.xml
Log:
https://jira.jboss.org/browse/RF-8668
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
+++ root/ui-sandbox/pom.xml 2010-05-26 18:11:01 UTC (rev 17291)
@@ -37,6 +37,5 @@
<modules>
<module>tables/trunk</module>
- <module>componentcontrol/trunk</module>
</modules>
</project>
\ No newline at end of file
14 years, 1 month
JBoss Rich Faces SVN: r17290 - in root/ui/misc/trunk: bom and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 14:09:50 -0400 (Wed, 26 May 2010)
New Revision: 17290
Added:
root/ui/misc/trunk/componentcontrol/
root/ui/misc/trunk/componentcontrol/pom.xml
root/ui/misc/trunk/componentcontrol/src/
Modified:
root/ui/misc/trunk/bom/pom.xml
root/ui/misc/trunk/functions/pom.xml
root/ui/misc/trunk/parent/pom.xml
root/ui/misc/trunk/pom.xml
Log:
https://jira.jboss.org/browse/RF-8668
Modified: root/ui/misc/trunk/bom/pom.xml
===================================================================
--- root/ui/misc/trunk/bom/pom.xml 2010-05-26 18:01:42 UTC (rev 17289)
+++ root/ui/misc/trunk/bom/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
@@ -51,6 +51,16 @@
</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/componentcontrol/pom.xml
===================================================================
--- root/ui/misc/trunk/componentcontrol/pom.xml (rev 0)
+++ root/ui/misc/trunk/componentcontrol/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
@@ -0,0 +1,119 @@
+<!--
+ 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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>componentcontrol-ui</artifactId>
+ <name>Richfaces UI Components: Component control UI</name>
+ <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>
+ <!-- todo remove this dependency -->
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <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>
+</project>
\ No newline at end of file
Copied: root/ui/misc/trunk/componentcontrol/src (from rev 17288, root/ui-sandbox/componentcontrol/trunk/ui/src)
Modified: root/ui/misc/trunk/functions/pom.xml
===================================================================
--- root/ui/misc/trunk/functions/pom.xml 2010-05-26 18:01:42 UTC (rev 17289)
+++ root/ui/misc/trunk/functions/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui.misc</groupId>
<artifactId>functions-ui</artifactId>
- <name>Richfaces UI Components: Miscellanous UI Functions</name>
+ <name>Richfaces UI Components: Functions UI</name>
<packaging>jar</packaging>
<dependencies>
Modified: root/ui/misc/trunk/parent/pom.xml
===================================================================
--- root/ui/misc/trunk/parent/pom.xml 2010-05-26 18:01:42 UTC (rev 17289)
+++ root/ui/misc/trunk/parent/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
@@ -36,10 +36,24 @@
<name>Richfaces UI Components: Miscellanous Parent</name>
<packaging>pom</packaging>
+ <properties>
+ <richfaces.core.ui.version>4.0.0-SNAPSHOT</richfaces.core.ui.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
+
+ <!-- TODO: remove this dependency used by componentControl -->
<dependency>
<groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${richfaces.core.ui.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-misc-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-05-26 18:01:42 UTC (rev 17289)
+++ root/ui/misc/trunk/pom.xml 2010-05-26 18:09:50 UTC (rev 17290)
@@ -40,6 +40,7 @@
<module>bom</module>
<module>parent</module>
<module>functions</module>
+ <module>componentcontrol</module>
</modules>
<build>
14 years, 1 month
JBoss Rich Faces SVN: r17288 - in root/ui/misc/trunk: functions and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 13:56:23 -0400 (Wed, 26 May 2010)
New Revision: 17288
Added:
root/ui/misc/trunk/functions/
root/ui/misc/trunk/functions/pom.xml
root/ui/misc/trunk/functions/src/
Removed:
root/ui/misc/trunk/ui/pom.xml
root/ui/misc/trunk/ui/src/
Modified:
root/ui/misc/trunk/pom.xml
Log:
https://jira.jboss.org/browse/RF-8668
Copied: root/ui/misc/trunk/functions/pom.xml (from rev 17277, root/ui/misc/trunk/ui/pom.xml)
===================================================================
--- root/ui/misc/trunk/functions/pom.xml (rev 0)
+++ root/ui/misc/trunk/functions/pom.xml 2010-05-26 17:56:23 UTC (rev 17288)
@@ -0,0 +1,113 @@
+<!--
+ 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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>functions-ui</artifactId>
+ <name>Richfaces UI Components: Miscellanous UI Functions</name>
+ <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>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <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>
+</project>
\ No newline at end of file
Copied: root/ui/misc/trunk/functions/src (from rev 17277, root/ui/misc/trunk/ui/src)
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-05-26 17:40:27 UTC (rev 17287)
+++ root/ui/misc/trunk/pom.xml 2010-05-26 17:56:23 UTC (rev 17288)
@@ -39,7 +39,7 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>ui</module>
+ <module>functions</module>
</modules>
<build>
Deleted: root/ui/misc/trunk/ui/pom.xml
===================================================================
--- root/ui/misc/trunk/ui/pom.xml 2010-05-26 17:40:27 UTC (rev 17287)
+++ root/ui/misc/trunk/ui/pom.xml 2010-05-26 17:56:23 UTC (rev 17288)
@@ -1,113 +0,0 @@
-<!--
- 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/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-ui</artifactId>
- <name>Richfaces UI Components: Miscellanous UI</name>
- <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>
- </dependency>
-
- <!-- JSF with dependencies -->
- <dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- tests -->
- <dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
- <scope>test</scope>
- </dependency>
- <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>
-</project>
\ No newline at end of file
14 years, 1 month