JBoss Rich Faces SVN: r17066 - root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-15 14:45:29 -0400 (Sat, 15 May 2010)
New Revision: 17066
Modified:
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
Log:
RF-8480
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-15 16:39:08 UTC (rev 17065)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-15 18:45:29 UTC (rev 17066)
@@ -300,4 +300,23 @@
assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId));
facesRequest.release();
}
+
+ @Test
+ public final void testScrolling() throws IOException {
+ FacesRequest facesRequest = startFacesRequest();
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
+ ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
+ .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
+ Map<String, Object> componentAttributes = component.getAttributes();
+ String clientId = component.getClientId(facesContext);
+ assertNull(componentAttributes.get(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST));
+ facesRequest.withParameter(clientId, clientId);
+ facesRequest.withParameter("rich:clientFirst", "28");
+ renderer.doDecode(facesContext, component);
+ assertEquals(28, componentAttributes.get(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST));
+ assertTrue(facesContext.getPartialViewContext().getRenderIds()
+ .contains(clientId + "@" + UIExtendedDataTable.SCROLL));
+ facesRequest.release();
+ }
}
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17065 - in root/ui-sandbox/tables/trunk/ui/src/test: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-15 12:39:08 -0400 (Sat, 15 May 2010)
New Revision: 17065
Modified:
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
root/ui-sandbox/tables/trunk/ui/src/test/resources/extendedDataTableTest.xhtml
Log:
RF-8481
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-15 14:26:04 UTC (rev 17064)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-15 16:39:08 UTC (rev 17065)
@@ -16,6 +16,7 @@
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
import javax.faces.view.ViewDeclarationLanguage;
+import javax.swing.SortOrder;
import org.jboss.test.faces.FacesEnvironment.FacesRequest;
import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment;
@@ -48,6 +49,17 @@
environment = null;
}
+ private FacesRequest startFacesRequest() throws IOException {
+ FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
+ facesRequest.withViewId("/extendedDataTableTest.jsf");
+ facesRequest.start();
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ViewHandler vh = facesContext.getApplication().getViewHandler();
+ ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
+ .getViewId());
+ vdl.buildView(facesContext, facesContext.getViewRoot());
+ return facesRequest;
+ }
/**
* Test method for {@link org.richfaces.renderkit.ExtendedDataTableRenderer#getComponentClass()}.
*
@@ -55,14 +67,8 @@
*/
@Test
public final void testGetComponentClass() throws IOException {
- FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
- facesRequest.withViewId("/extendedDataTableTest.jsf");
- facesRequest.start();
+ FacesRequest facesRequest = startFacesRequest();
FacesContext facesContext = FacesContext.getCurrentInstance();
- ViewHandler vh = facesContext.getApplication().getViewHandler();
- ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
- .getViewId());
- vdl.buildView(facesContext, facesContext.getViewRoot());
UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
.getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
@@ -179,14 +185,8 @@
@Test
public final void testFilteringWithoutClean() throws IOException {
- FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
- facesRequest.withViewId("/extendedDataTableTest.jsf");
- facesRequest.start();
+ FacesRequest facesRequest = startFacesRequest();
FacesContext facesContext = FacesContext.getCurrentInstance();
- ViewHandler vh = facesContext.getApplication().getViewHandler();
- ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
- .getViewId());
- vdl.buildView(facesContext, facesContext.getViewRoot());
UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
.getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
@@ -206,14 +206,8 @@
@Test
public final void testFilteringWithClean() throws IOException {
- FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
- facesRequest.withViewId("/extendedDataTableTest.jsf");
- facesRequest.start();
+ FacesRequest facesRequest = startFacesRequest();
FacesContext facesContext = FacesContext.getCurrentInstance();
- ViewHandler vh = facesContext.getApplication().getViewHandler();
- ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
- .getViewId());
- vdl.buildView(facesContext, facesContext.getViewRoot());
UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
.getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
@@ -233,17 +227,11 @@
@Test
public final void testColumnResizing() throws IOException {
- FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
- facesRequest.withViewId("/extendedDataTableTest.jsf");
- facesRequest.start();
+ FacesRequest facesRequest = startFacesRequest();
FacesContext facesContext = FacesContext.getCurrentInstance();
- ViewHandler vh = facesContext.getApplication().getViewHandler();
- ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
- .getViewId());
- vdl.buildView(facesContext, facesContext.getViewRoot());
UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
- .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
+ .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes();
assertNull(column1Attributes.get("width"));
facesRequest.withParameter(component.getClientId(facesContext) + ":wi", "column1:200px");
@@ -254,14 +242,8 @@
@Test
public final void testColumnReordering() throws IOException {
- FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf");
- facesRequest.withViewId("/extendedDataTableTest.jsf");
- facesRequest.start();
+ FacesRequest facesRequest = startFacesRequest();
FacesContext facesContext = FacesContext.getCurrentInstance();
- ViewHandler vh = facesContext.getApplication().getViewHandler();
- ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot()
- .getViewId());
- vdl.buildView(facesContext, facesContext.getViewRoot());
UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
.getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
@@ -276,4 +258,46 @@
(String[]) componentAttributes.get("columnsOrder")));
facesRequest.release();
}
+
+ @Test
+ public final void testSortingWithoutClean() throws IOException {
+ FacesRequest facesRequest = startFacesRequest();
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
+ ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
+ .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
+ Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes();
+ Map<String, Object> column2Attributes = component.findComponent("column2").getAttributes();
+ String clientId = component.getClientId(facesContext);
+ assertEquals(SortOrder.UNSORTED, column1Attributes.get("sortOrder"));
+ assertEquals(SortOrder.ASCENDING, column2Attributes.get("sortOrder"));
+ facesRequest.withParameter(clientId, clientId);
+ facesRequest.withParameter(clientId + "rich:sorting", "column1:null:null");
+ renderer.doDecode(facesContext, component);
+ assertEquals(SortOrder.ASCENDING, column1Attributes.get("sortOrder"));
+ assertEquals(SortOrder.ASCENDING, column2Attributes.get("sortOrder"));
+ assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId));
+ facesRequest.release();
+ }
+
+ @Test
+ public final void testSortingWithClean() throws IOException {
+ FacesRequest facesRequest = startFacesRequest();
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table");
+ ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance()
+ .getRenderKit().getRenderer(component.getFamily(), component.getRendererType());
+ Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes();
+ Map<String, Object> column2Attributes = component.findComponent("column2").getAttributes();
+ String clientId = component.getClientId(facesContext);
+ assertEquals(SortOrder.UNSORTED, column1Attributes.get("sortOrder"));
+ assertEquals(SortOrder.ASCENDING, column2Attributes.get("sortOrder"));
+ facesRequest.withParameter(clientId, clientId);
+ facesRequest.withParameter(clientId + "rich:sorting", "column1:DESCENDING:true");
+ renderer.doDecode(facesContext, component);
+ assertEquals(SortOrder.DESCENDING, column1Attributes.get("sortOrder"));
+ assertEquals(SortOrder.UNSORTED, column2Attributes.get("sortOrder"));
+ assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId));
+ facesRequest.release();
+ }
}
Modified: root/ui-sandbox/tables/trunk/ui/src/test/resources/extendedDataTableTest.xhtml
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/resources/extendedDataTableTest.xhtml 2010-05-15 14:26:04 UTC (rev 17064)
+++ root/ui-sandbox/tables/trunk/ui/src/test/resources/extendedDataTableTest.xhtml 2010-05-15 16:39:08 UTC (rev 17065)
@@ -35,7 +35,7 @@
</h:head>
<h:body>
- <rich:extendedDataTable id="table" frozenColumns="1" value="value" var="var">
+ <rich:extendedDataTable id="table" frozenColumns="1" value="value" var="var" sortMode="multi">
<f:facet name="header">
<h:outputText id="headerFacet" value="headerFacet"/>
</f:facet>
@@ -54,7 +54,7 @@
<h:outputText id="footerColumnFacet1" value="footerColumnFacet1"/>
</f:facet>
</rich:column>
- <rich:column id="column2" filterValue="filterValue2">
+ <rich:column id="column2" filterValue="filterValue2" sortOrder="ASCENDING">
<f:facet name="header">
<h:outputText id="headerColumnFacet2" value="headerColumnFacet2"/>
</f:facet>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17064 - root/ui/core/trunk/api/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-15 10:26:04 -0400 (Sat, 15 May 2010)
New Revision: 17064
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java
Log:
AbstractAttachQueue: added instance check for handled system events
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-05-15 14:25:19 UTC (rev 17063)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-05-15 14:26:04 UTC (rev 17064)
@@ -136,22 +136,24 @@
public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
super.processEvent(event);
- String queueId = getClientId();
-
- if (componentsToAssociate != null) {
- for (UIComponent componentToAssociate : componentsToAssociate) {
- immediateAssociateWith(componentToAssociate, queueId);
+ if (event instanceof PostAddToViewEvent) {
+ String queueId = getClientId();
+
+ if (componentsToAssociate != null) {
+ for (UIComponent componentToAssociate : componentsToAssociate) {
+ immediateAssociateWith(componentToAssociate, queueId);
+ }
+
+ componentsToAssociate = null;
}
- componentsToAssociate = null;
- }
-
- if (behaviorsToAssociate != null) {
- for (AjaxBehavior ajaxBehavior : behaviorsToAssociate) {
- immediateAssociateWith(ajaxBehavior, queueId);
+ if (behaviorsToAssociate != null) {
+ for (AjaxBehavior ajaxBehavior : behaviorsToAssociate) {
+ immediateAssociateWith(ajaxBehavior, queueId);
+ }
+
+ behaviorsToAssociate = null;
}
-
- behaviorsToAssociate = null;
}
}
}
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17063 - in root/examples/core-demo/trunk/src/main: webapp and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-15 10:25:19 -0400 (Sat, 15 May 2010)
New Revision: 17063
Added:
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/ActionListenerBean.java
root/examples/core-demo/trunk/src/main/webapp/actionListener.xhtml
root/examples/core-demo/trunk/src/main/webapp/resources/demo/
root/examples/core-demo/trunk/src/main/webapp/resources/demo/actionComposite.xhtml
Modified:
root/examples/core-demo/trunk/src/main/webapp/welcome.xhtml
Log:
https://jira.jboss.org/browse/RF-8444
Added: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/ActionListenerBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/ActionListenerBean.java (rev 0)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/ActionListenerBean.java 2010-05-15 14:25:19 UTC (rev 17063)
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+package org.richfaces.demo;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.NoneScoped;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+@ManagedBean
+@NoneScoped
+public class ActionListenerBean {
+
+ public static final class ActionListenerImpl implements ActionListener {
+
+ public void processAction(ActionEvent event) throws AbortProcessingException {
+ addFacesMessage("Implementation of ActionListener created and called: " + this);
+ }
+
+ }
+
+ private static final class BoundActionListener implements ActionListener {
+
+ public void processAction(ActionEvent event) throws AbortProcessingException {
+ addFacesMessage("Bound listener called");
+ }
+
+ }
+
+ private ActionListener actionListener = new BoundActionListener();
+
+ private static void addFacesMessage(String messageText) {
+ FacesContext context = FacesContext.getCurrentInstance();
+ context.addMessage(null, new FacesMessage(messageText));
+ }
+
+ public void handleActionMethod(ActionEvent event) throws AbortProcessingException {
+ addFacesMessage("Method expression listener called");
+ }
+
+ public void handleActionMethodComposite(ActionEvent event) throws AbortProcessingException {
+ addFacesMessage("Method expression listener called from composite component");
+ }
+
+ public ActionListener getActionListener() {
+ return actionListener;
+ }
+
+}
Added: root/examples/core-demo/trunk/src/main/webapp/actionListener.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/actionListener.xhtml (rev 0)
+++ root/examples/core-demo/trunk/src/main/webapp/actionListener.xhtml 2010-05-15 14:25:19 UTC (rev 17063)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:a4j_ext="http://richfaces.org/a4j_ext"
+ xmlns:demo="http://java.sun.com/jsf/composite/demo">
+<f:view>
+ <h:head>
+ </h:head>
+ <h:body>
+ <h:form id="form">
+ <h:messages id="messages" />
+
+ <h:panelGrid columns="1">
+ <h:commandButton value="Invoke listener by type">
+ <a4j_ext:actionListener type="org.richfaces.demo.ActionListenerBean$ActionListenerImpl" />
+ <f:ajax render="messages" />
+ </h:commandButton>
+
+ <h:commandButton value="Invoke listener by binding">
+ <a4j_ext:actionListener binding="#{actionListenerBean.actionListener}" />
+ <f:ajax render="messages" />
+ </h:commandButton>
+
+ <h:commandButton value="Invoke listener method">
+ <a4j_ext:actionListener listener="#{actionListenerBean.handleActionMethod}" />
+ <f:ajax render="messages" />
+ </h:commandButton>
+
+ <demo:actionComposite render=":form:messages" value="Invoke listener method in composite component">
+ <a4j_ext:actionListener for="button" listener="#{actionListenerBean.handleActionMethodComposite}" />
+ </demo:actionComposite>
+ </h:panelGrid>
+ </h:form>
+ </h:body>
+</f:view>
+</html>
\ No newline at end of file
Added: root/examples/core-demo/trunk/src/main/webapp/resources/demo/actionComposite.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/resources/demo/actionComposite.xhtml (rev 0)
+++ root/examples/core-demo/trunk/src/main/webapp/resources/demo/actionComposite.xhtml 2010-05-15 14:25:19 UTC (rev 17063)
@@ -0,0 +1,23 @@
+<!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:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+
+<composite:interface>
+ <composite:actionSource name="button" />
+ <composite:attribute name="render" />
+ <composite:attribute name="execute" />
+ <composite:attribute name="value" />
+</composite:interface>
+
+<composite:implementation>
+ <h:commandButton id="button" value="#{cc.attrs.value}">
+ <composite:insertChildren />
+
+ <f:ajax render="#{cc.attrs.render}" execute="#{cc.attrs.execute}" />
+ </h:commandButton>
+</composite:implementation>
+</html>
Modified: root/examples/core-demo/trunk/src/main/webapp/welcome.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/welcome.xhtml 2010-05-15 14:24:28 UTC (rev 17062)
+++ root/examples/core-demo/trunk/src/main/webapp/welcome.xhtml 2010-05-15 14:25:19 UTC (rev 17063)
@@ -9,6 +9,7 @@
<center>
<h1>Welcome To RichFaces 4.x Core Demo</h1>
<ul>
+ <li><h:link outcome="actionListener">a4j:actionListener</h:link></li>
<li><h:link outcome="ajax">a4j:ajax</h:link></li>
<li><h:link outcome="attachQueue">a4j:attachQueue</h:link></li>
<li><h:link outcome="button">a4j:commandButton</h:link></li>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17062 - in root/ui/core/trunk/api/src/main: resources/META-INF and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-15 10:24:28 -0400 (Sat, 15 May 2010)
New Revision: 17062
Added:
root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/ActionListenerHandler.java
root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/TagHandlerUtils.java
root/ui/core/trunk/api/src/main/resources/META-INF/a4j_ext.taglib.xml
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java
Log:
https://jira.jboss.org/browse/RF-8444
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/ActionListenerHandler.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/ActionListenerHandler.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/ActionListenerHandler.java 2010-05-15 14:24:28 UTC (rev 17062)
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+package org.richfaces.view.facelets.html;
+
+import java.io.IOException;
+import java.io.Serializable;
+
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+import javax.faces.component.ActionSource;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+import javax.faces.event.MethodExpressionActionListener;
+import javax.faces.view.ActionSource2AttachedObjectHandler;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagAttributeException;
+import javax.faces.view.facelets.TagConfig;
+import javax.faces.view.facelets.TagException;
+import javax.faces.view.facelets.TagHandler;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class ActionListenerHandler extends TagHandler implements ActionSource2AttachedObjectHandler {
+
+ private TagAttribute binding;
+
+ private String listenerType;
+
+ private TagAttribute listenerMethod;
+
+ private static final class LazyActionListener implements ActionListener, Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6303879250524609909L;
+
+ private final String type;
+
+ private final ValueExpression binding;
+
+ public LazyActionListener(String type, ValueExpression binding) {
+ this.type = type;
+ this.binding = binding;
+ }
+
+ public void processAction(ActionEvent event) throws AbortProcessingException {
+ ActionListener instance = null;
+ FacesContext faces = FacesContext.getCurrentInstance();
+ if (faces == null) {
+ return;
+ }
+
+ if (this.binding != null) {
+ instance = (ActionListener) binding.getValue(faces.getELContext());
+ }
+
+ if (instance == null && this.type != null) {
+ try {
+ instance = TagHandlerUtils.loadClass(this.type, ActionListener.class).newInstance();
+ } catch (Exception e) {
+ throw new AbortProcessingException(
+ "Couldn't lazily instantiate ActionListener", e);
+ }
+
+ if (this.binding != null) {
+ binding.setValue(faces.getELContext(), instance);
+ }
+ }
+
+ if (instance != null) {
+ instance.processAction(event);
+ }
+ }
+ }
+
+ public ActionListenerHandler(TagConfig config) {
+ super(config);
+
+ this.binding = this.getAttribute("binding");
+
+ TagAttribute type = this.getAttribute("type");
+ if (type != null) {
+ if (!type.isLiteral()) {
+ throw new TagAttributeException(type, "Must be a literal class name of type ActionListener");
+ } else {
+ // test it out
+ try {
+ TagHandlerUtils.loadClass(type.getValue(), ActionListener.class);
+ } catch (ClassNotFoundException e) {
+ throw new TagAttributeException(type,
+ "Couldn't qualify ActionListener", e);
+ } catch (ClassCastException e) {
+ throw new TagAttributeException(type,
+ "Qualified class is not ActionListener", e);
+ }
+ }
+
+ this.listenerType = type.getValue();
+ } else {
+ this.listenerType = null;
+ }
+
+ this.listenerMethod = this.getAttribute("listener");
+
+ if (this.listenerMethod != null && this.binding != null) {
+ throw new TagException(this.tag, "Attributes 'listener' and 'binding' cannot be used simultaneously");
+ }
+
+ if (this.listenerMethod != null && this.listenerType != null) {
+ throw new TagException(this.tag, "Attributes 'listener' and 'type' cannot be used simultaneously");
+ }
+ }
+
+ public void applyAttachedObject(FacesContext context, UIComponent parent) {
+ if (!(parent instanceof ActionSource)) {
+ throw new TagException(this.tag, "Parent is not of type ActionSource, type is: " + parent);
+ }
+
+ ActionSource as = (ActionSource) parent;
+
+ FaceletContext ctx = (FaceletContext) context.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY);
+
+ if (this.listenerMethod != null) {
+ MethodExpression listenerMethodExpression = this.listenerMethod.
+ getMethodExpression(ctx, Void.TYPE, new Class<?>[] { ActionEvent.class });
+
+ as.addActionListener(new MethodExpressionActionListener(listenerMethodExpression));
+ } else {
+ ValueExpression b = null;
+ if (this.binding != null) {
+ b = this.binding.getValueExpression(ctx, ActionListener.class);
+ }
+ ActionListener listener = new LazyActionListener(this.listenerType, b);
+ as.addActionListener(listener);
+ }
+ }
+
+ public String getFor() {
+ String result = null;
+ TagAttribute attr = this.getAttribute("for");
+
+ if (null != attr) {
+ result = attr.getValue();
+ }
+
+ return result;
+ }
+
+ public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
+ if (null == parent || !(ComponentHandler.isNew(parent))) {
+ return;
+ }
+
+ if (UIComponent.isCompositeComponent(parent)) {
+ if (null == getFor()) {
+ throw new TagException(this.tag,
+ "actionListener tags nested within composite components must have a non-null 'for' attribute");
+ }
+
+ TagHandlerUtils.getOrCreateRetargetableHandlersList(parent).add(this);
+ } else {
+ applyAttachedObject(ctx.getFacesContext(), parent);
+ }
+ }
+
+}
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-05-15 12:28:52 UTC (rev 17061)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-05-15 14:24:28 UTC (rev 17062)
@@ -26,10 +26,8 @@
import java.beans.BeanInfo;
import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import javax.el.ELContext;
import javax.el.MethodExpression;
@@ -41,7 +39,6 @@
import javax.faces.event.AbortProcessingException;
import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.event.AjaxBehaviorListener;
-import javax.faces.view.AttachedObjectHandler;
import javax.faces.view.AttachedObjectTarget;
import javax.faces.view.BehaviorHolderAttachedObjectHandler;
import javax.faces.view.BehaviorHolderAttachedObjectTarget;
@@ -59,8 +56,6 @@
//TODO nick - use TagHandlerDelegate
public class AjaxHandler extends TagHandler implements BehaviorHolderAttachedObjectHandler {
- // TODO - is that implementation dependency?
- private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers";
private final TagAttribute disabled;
private final TagAttribute event;
private final TagAttribute execute;
@@ -137,20 +132,6 @@
}
}
- private static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) {
- Map<String, Object> attrs = component.getAttributes();
- @SuppressWarnings({
- "unchecked"}) List<AttachedObjectHandler> list =
- (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS);
-
- if (list == null) {
- list = new ArrayList<AttachedObjectHandler>();
- attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list);
- }
-
- return list;
- }
-
private void applyNested(FaceletContext ctx, UIComponent parent, AjaxBehavior behavior) {
if (!ComponentHandler.isNew(parent)) {
return;
@@ -196,7 +177,7 @@
}
if (supportedEvent) {
- getOrCreateRetargetableHandlersList(parent).add(this);
+ TagHandlerUtils.getOrCreateRetargetableHandlersList(parent).add(this);
} else {
throw new TagException(tag, "Error: enclosing composite component does not support event " + eventName);
}
Added: root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/TagHandlerUtils.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/TagHandlerUtils.java (rev 0)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/html/TagHandlerUtils.java 2010-05-15 14:24:28 UTC (rev 17062)
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.richfaces.view.facelets.html;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.view.AttachedObjectHandler;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+final class TagHandlerUtils {
+
+ // TODO - is that implementation dependency?
+ private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers";
+
+ private TagHandlerUtils() {
+ //utility class constructor
+ }
+
+ static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) {
+ Map<String, Object> attrs = component.getAttributes();
+ @SuppressWarnings({
+ "unchecked"}) List<AttachedObjectHandler> list =
+ (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS);
+
+ if (list == null) {
+ list = new ArrayList<AttachedObjectHandler>();
+ attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list);
+ }
+
+ return list;
+ }
+
+ static <T> Class<? extends T> loadClass(String className, Class<T> type)
+ throws ClassNotFoundException, ClassCastException {
+
+ ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+ Class<?> loadedClass = Class.forName(className, false, ccl);
+
+ return loadedClass.asSubclass(type);
+ }
+
+}
Added: root/ui/core/trunk/api/src/main/resources/META-INF/a4j_ext.taglib.xml
===================================================================
--- root/ui/core/trunk/api/src/main/resources/META-INF/a4j_ext.taglib.xml (rev 0)
+++ root/ui/core/trunk/api/src/main/resources/META-INF/a4j_ext.taglib.xml 2010-05-15 14:24:28 UTC (rev 17062)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
+ version="2.0" id="a4j_ext">
+ <namespace>http://richfaces.org/a4j_ext</namespace>
+ <tag>
+ <tag-name>actionListener</tag-name>
+ <handler-class>org.richfaces.view.facelets.html.ActionListenerHandler</handler-class>
+ <attribute>
+ <description>
+ Value binding expression that evaluates to an object that implements
+ javax.faces.event.ActionListener.
+ </description>
+ <name>binding</name>
+ <type>javax.faces.event.ActionListener</type>
+ </attribute>
+ <attribute>
+ <description>
+ If present, this attribute refers to the value of one of the exposed attached objects within
+ the composite component inside of which this tag is nested.
+ </description>
+ <name>for</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>
+ Method expression referencing a method that will be called when an ActionEvent has been broadcast
+ for the listener. Shouldn't be used simultaneously with 'binding' or 'type' attributes.
+ </description>
+ <name>listener</name>
+ <type>javax.el.MethodExpression</type>
+ </attribute>
+ <attribute>
+ <description>
+ Fully qualified Java class name of an ActionListener to be created and registered.
+ </description>
+ <name>type</name>
+ <type>java.lang.String</type>
+ </attribute>
+ </tag>
+</facelet-taglib>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17061 - in root/examples/richfaces-showcase/trunk: src/main/java/org/richfaces/demo and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-15 08:28:52 -0400 (Sat, 15 May 2010)
New Revision: 17061
Added:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/Capital.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsParser.java
root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/
root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/capitals/
root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/capitals/capitals.xml
Modified:
root/examples/richfaces-showcase/trunk/pom.xml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-8298
parsing xml for tables data creation added.
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-15 11:14:45 UTC (rev 17060)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-15 12:28:52 UTC (rev 17061)
@@ -22,6 +22,12 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>core-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ </dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/Capital.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/Capital.java (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/Capital.java 2010-05-15 12:28:52 UTC (rev 17061)
@@ -0,0 +1,56 @@
+package org.richfaces.demo.capitals;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlElement;
+
+public class Capital implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1042449580199397136L;
+
+ private static final String FILE_EXT = ".gif";
+
+ private String name;
+ private String state;
+ private String timeZone;
+
+ public Capital() {
+ }
+
+ @XmlElement
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @XmlElement
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ private String stateNameToFileName() {
+ return state.replaceAll("\\s", "").toLowerCase();
+ }
+
+ public String getStateFlag() {
+ return "/images/capitals/" + stateNameToFileName() + FILE_EXT;
+ }
+
+ @XmlElement
+ public String getTimeZone() {
+ return timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+}
Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2010-05-15 12:28:52 UTC (rev 17061)
@@ -0,0 +1,29 @@
+package org.richfaces.demo.capitals;
+
+import java.util.List;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.SessionScoped;
+
+@ManagedBean
+@SessionScoped
+public class CapitalsBean {
+
+ @ManagedProperty(value = "#{capitalsParser.capitalsList}")
+ private List<Capital> capitals;
+
+ public CapitalsBean() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public List<Capital> getCapitals() {
+ return capitals;
+ }
+
+ public void setCapitals(List<Capital> capitals) {
+ this.capitals = capitals;
+ }
+
+
+}
Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsParser.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsParser.java (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/capitals/CapitalsParser.java 2010-05-15 12:28:52 UTC (rev 17061)
@@ -0,0 +1,52 @@
+package org.richfaces.demo.capitals;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.faces.FacesException;
+import javax.faces.bean.ApplicationScoped;
+import javax.faces.bean.ManagedBean;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@ManagedBean
+@ApplicationScoped
+public class CapitalsParser {
+
+ private List<Capital> capitalsList;
+
+ @XmlRootElement(name = "capitals")
+ private static final class CapitalsHolder {
+
+ private List<Capital> capitals;
+
+ @XmlElement(name = "capital")
+ public List<Capital> getCapitals() {
+ return capitals;
+ }
+
+ @SuppressWarnings("unused")
+ public void setCapitals(List<Capital> capitals) {
+ this.capitals = capitals;
+ }
+ }
+
+ public synchronized List<Capital> getCapitalsList() {
+ if (capitalsList == null) {
+ ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+ URL resource = ccl.getResource("org/richfaces/demo/data/capitals/capitals.xml");
+ JAXBContext context;
+ try {
+ context = JAXBContext.newInstance(CapitalsHolder.class);
+ CapitalsHolder capitalsHolder = (CapitalsHolder) context.createUnmarshaller().unmarshal(resource);
+ capitalsList = capitalsHolder.getCapitals();
+ } catch (JAXBException e) {
+ throw new FacesException(e.getMessage(), e);
+ }
+ }
+
+ return capitalsList;
+ }
+}
Added: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/capitals/capitals.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/capitals/capitals.xml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/capitals/capitals.xml 2010-05-15 12:28:52 UTC (rev 17061)
@@ -0,0 +1,503 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<capitals>
+ <capital>
+ <state>Alabama</state>
+ <name>Montgomery</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Birmingham</item>
+ <item>Montgomery</item>
+ <item>Mobile</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Alaska</state>
+ <name>Juneau</name>
+ <timeZone>GMT-9</timeZone>
+ <data>
+ <item>Anchorage</item>
+ <item>Fairbanks</item>
+ <item>Juneau</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Arizona</state>
+ <name>Phoenix</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Phoenix</item>
+ <item>Tucson</item>
+ <item>Mesa</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Arkansas</state>
+ <name>Little Rock</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Little Rock</item>
+ <item>Fort Smith</item>
+ <item>Fayetteville</item>
+ </data>
+ </capital>
+ <capital>
+ <state>California</state>
+ <name>Sacramento</name>
+ <timeZone>GMT-8</timeZone>
+ <data>
+ <item>Los Angeles</item>
+ <item>San Diego</item>
+ <item>San Jose</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Colorado</state>
+ <name>Denver</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Denver</item>
+ <item>Colorado Springs</item>
+ <item>Aurora</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Connecticut</state>
+ <name>Hartford</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Bridgeport</item>
+ <item>New Haven</item>
+ <item>Hartford</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Delaware</state>
+ <name>Dover</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Wilmington</item>
+ <item>Dover</item>
+ <item>Newark</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Florida</state>
+ <name>Tallahassee</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Jacksonville</item>
+ <item>Miami</item>
+ <item>Tampa</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Georgia</state>
+ <name>Atlanta</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Atlanta</item>
+ <item>Augusta</item>
+ <item>Columbus</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Hawaii</state>
+ <name>Honolulu</name>
+ <timeZone>GMT-10</timeZone>
+ <data>
+ <item>Honolulu1</item>
+ <item>Hilo1</item>
+ <item>Kailua1</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Idaho</state>
+ <name>Boise</name>
+ <timeZone>GMT-8</timeZone>
+ <data>
+ <item>Boise</item>
+ <item>Nampa</item>
+ <item>Meridian</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Illinois</state>
+ <name>Springfield</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Chicago</item>
+ <item>Aurora</item>
+ <item>Rockford</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Indiana</state>
+ <name>Indianapolis</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Indianapolis</item>
+ <item>Fort Wayne</item>
+ <item>Evansville</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Iowa</state>
+ <name>Des Moines</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Des Moines</item>
+ <item>Cedar Rapids</item>
+ <item>Davenport</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Kansas</state>
+ <name>Topeka</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Wichita</item>
+ <item>Overland Park</item>
+ <item>Kansas City</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Kentucky</state>
+ <name>Frankfort</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Louisville</item>
+ <item>Lexington</item>
+ <item>Owensboro</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Louisiana</state>
+ <name>Baton Rouge</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>New Orleans</item>
+ <item>Baton Rouge</item>
+ <item>Shreveport</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Maine</state>
+ <name>Augusta</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Portland</item>
+ <item>Lewiston</item>
+ <item>Bangor</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Maryland</state>
+ <name>Annapolis</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Baltimore</item>
+ <item>Columbia</item>
+ <item>Silver Spring</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Massachusetts</state>
+ <name>Boston</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Boston</item>
+ <item>Worcester</item>
+ <item>Springfield</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Michigan</state>
+ <name>Lansing</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Detroit</item>
+ <item>Grand Rapids</item>
+ <item>Warren</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Minnesota</state>
+ <name>St. Paul</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Minneapolis</item>
+ <item>Saint Paul</item>
+ <item>Rochester</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Mississippi</state>
+ <name>Jackson</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Jackson</item>
+ <item>Gulfport</item>
+ <item>Biloxi</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Missouri</state>
+ <name>Jefferson City</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Kansas City</item>
+ <item>Saint Louis</item>
+ <item>Springfield</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Montana</state>
+ <name>Helena</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Billings</item>
+ <item>Missoula</item>
+ <item>Great Falls</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Nebraska</state>
+ <name>Lincoln</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Omaha</item>
+ <item>Lincoln</item>
+ <item>Bellevue</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Nevada</state>
+ <name>Carson City</name>
+ <timeZone>GMT-8</timeZone>
+ <data>
+ <item>Las Vegas</item>
+ <item>Henderson</item>
+ <item>Reno</item>
+ </data>
+ </capital>
+ <capital>
+ <state>New Hampshire</state>
+ <name>Concord</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Manchester</item>
+ <item>Nashua</item>
+ <item>Concord</item>
+ </data>
+ </capital>
+ <capital>
+ <state>New Jersey</state>
+ <name>Trenton</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Newark</item>
+ <item>Jersey City</item>
+ <item>Paterson</item>
+ </data>
+ </capital>
+ <capital>
+ <state>New Mexico</state>
+ <name>Santa Fe</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Albuquerque</item>
+ <item>Las Cruces</item>
+ <item>Santa Fe</item>
+ </data>
+ </capital>
+ <capital>
+ <state>New York</state>
+ <name>Albany</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>New York City</item>
+ <item>Buffalo</item>
+ <item>Rochester</item>
+ </data>
+ </capital>
+ <capital>
+ <state>North Carolina</state>
+ <name>Raleigh</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Charlotte</item>
+ <item>Raleigh</item>
+ <item>Greensboro</item>
+ </data>
+ </capital>
+ <capital>
+ <state>North Dakota</state>
+ <name>Bismarck</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Fargo</item>
+ <item>Bismarck</item>
+ <item>Grand Forks</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Ohio</state>
+ <name>Columbus</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Columbus</item>
+ <item>Cleveland</item>
+ <item>Cincinnati</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Oklahoma</state>
+ <name>Oklahoma City</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Oklahoma City</item>
+ <item>Tulsa</item>
+ <item>Norman</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Oregon</state>
+ <name>Salem</name>
+ <timeZone>GMT-8</timeZone>
+ <data>
+ <item>Portland</item>
+ <item>Salem</item>
+ <item>Eugene</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Pennsylvania</state>
+ <name>Harrisburg</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Philadelphia</item>
+ <item>Pittsburgh</item>
+ <item>Allentown</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Rhode Island</state>
+ <name>Providence</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Providence</item>
+ <item>Warwick</item>
+ <item>Cranston</item>
+ </data>
+ </capital>
+ <capital>
+ <state>South Carolina</state>
+ <name>Columbia</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Columbia</item>
+ <item>Charleston</item>
+ <item>North Charleston</item>
+ </data>
+ </capital>
+ <capital>
+ <state>South Dakota</state>
+ <name>Pierre</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Sioux Falls</item>
+ <item>Rapid City</item>
+ <item>Aberdeen</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Tennessee</state>
+ <name>Nashville</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Memphis</item>
+ <item>Nashville</item>
+ <item>Knoxville</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Texas</state>
+ <name>Austin</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Houston</item>
+ <item>San Antonio</item>
+ <item>Dallas</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Utah</state>
+ <name>Salt Lake City</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Salt Lake City</item>
+ <item>Provo</item>
+ <item>West Valley City</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Vermont</state>
+ <name>Montpelier</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Burlington</item>
+ <item>Rutland</item>
+ <item>South Burlington</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Virginia</state>
+ <name>Richmond</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Virginia Beach</item>
+ <item>Norfolk</item>
+ <item>Chesapeake</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Washington</state>
+ <name>Olympia</name>
+ <timeZone>GMT-8</timeZone>
+ <data>
+ <item>Seattle</item>
+ <item>Spokane</item>
+ <item>Tacoma</item>
+ </data>
+ </capital>
+ <capital>
+ <state>West Virginia</state>
+ <name>Charleston</name>
+ <timeZone>GMT-5</timeZone>
+ <data>
+ <item>Charleston</item>
+ <item>Huntington</item>
+ <item>Parkersburg</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Wisconsin</state>
+ <name>Madison</name>
+ <timeZone>GMT-6</timeZone>
+ <data>
+ <item>Milwaukee</item>
+ <item>Madison</item>
+ <item>Green Bay</item>
+ </data>
+ </capital>
+ <capital>
+ <state>Wyoming</state>
+ <name>Cheyenne</name>
+ <timeZone>GMT-7</timeZone>
+ <data>
+ <item>Cheyenne</item>
+ <item>Casper</item>
+ <item>Laramie</item>
+ </data>
+ </capital>
+</capitals>
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-15 11:14:45 UTC (rev 17060)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-15 12:28:52 UTC (rev 17061)
@@ -8,40 +8,18 @@
<ui:composition>
<h:form>
- <tbl:extendedDataTable frozenColumns="1" value="#{carsBean.allCars}" rows="100" var="car" id="table" clientRows="14" style="width:300px; height:300px;">
+ <tbl:extendedDataTable frozenColumns="1" value="#{capitalsBean.capitals}" rows="100" var="cap" id="table" clientRows="50" style="width:300px; height:300px;">
<tbl:column>
<f:facet name="header">
- <h:outputText value="Make" />
+ <h:outputText value="name" />
</f:facet>
- <h:outputText value="#{car.make}"/>
+ <h:outputText value="#{cap.name}"/>
<f:facet name="footer">
remove this also to check
</f:facet>
</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="Actions" />
- </f:facet>
- <a4j:commandLink value="Edit" action="#{carsBean.edit}" render="table"/>
- <h:outputText value=" " />
- <a4j:commandLink value="Remove" action="#{carsBean.remove}" render="table"/>
- </tbl:column>
- <f:facet name="footer">
- <h:outputText value="remove footer for test" />
- </f:facet>
</tbl:extendedDataTable>
+ <a4j:commandButton execute="@this" render="table" value="table"></a4j:commandButton>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17060 - root/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-15 07:14:45 -0400 (Sat, 15 May 2010)
New Revision: 17060
Modified:
root/examples/pom.xml
Log:
correct pom structure
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
+++ root/examples/pom.xml 2010-05-15 11:14:45 UTC (rev 17060)
@@ -38,7 +38,7 @@
<modules>
<module>core-demo/trunk</module>
<module>repeater-demo/trunk</module>
- <module>richfaces-showcase/trunk</module>
+ <!--<module>richfaces-showcase/trunk</module>-->
<!--<module>dist/trunk</module>-->
</modules>
@@ -100,6 +100,12 @@
<profiles>
<profile>
+ <id>sandbox</id>
+ <modules>
+ <module>richfaces-showcase/trunk</module>
+ </modules>
+ </profile>
+ <profile>
<id>jee5</id>
<dependencies>
<dependency>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17059 - in root: commons/trunk and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-15 07:12:06 -0400 (Sat, 15 May 2010)
New Revision: 17059
Modified:
root/commons/trunk/pom.xml
root/pom.xml
root/ui-sandbox/componentcontrol/trunk/pom.xml
root/ui-sandbox/datascroller/trunk/pom.xml
root/ui-sandbox/pom.xml
root/ui-sandbox/tables/trunk/pom.xml
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct pom structure
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/commons/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -42,5 +42,13 @@
<module>parent</module>
<module>api</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -37,9 +37,9 @@
<module>core/${core.svn.dir}</module>
<module>cdk/${cdk.svn.dir}</module>
<module>ui/core/${ui.svn.dir}</module>
- <!--<module>ui-sandbox/${ui-sandbox.svn.dir}</module>-->
+ <!--<module>ui-sandbox</module>-->
<module>examples</module>
- <module>examples-sandbox/${examples-sandbox.svn.dir}</module>
+ <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>-->
<!--<module>doc/${doc.svn.dir}</module>-->
</modules>
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-15 11:12:06 UTC (rev 17059)
@@ -31,7 +31,7 @@
/**
* @author Nick Belaevski Renderer for queue component
*/
- @JsfRenderer(type="org.richfaces.QueueRenderer", family="org.richfaces.Queue")
+@JsfRenderer(type = "org.richfaces.QueueRenderer", family = "org.richfaces.Queue")
public class QueueRenderer extends QueueRendererBase {
@Override
@@ -46,8 +46,7 @@
} else {
name = AbstractQueue.GLOBAL_QUEUE_NAME;
if (!ContextInitParameters.isGlobalQueueEnabled(FacesContext.getCurrentInstance())) {
- LOGGER
- .warn("Global queue is disabled by you are using unnamed queue, so new global queue will be created with defined parameters");
+ LOGGER.warn("Global queue is disabled by you are using unnamed queue, so new global queue will be created with defined parameters");
}
}
comp.getAttributes().put(NAME_ATTRIBBUTE, name);
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-15 11:12:06 UTC (rev 17059)
@@ -52,6 +52,10 @@
@ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) })
public abstract class QueueRendererBase extends Renderer implements ComponentSystemEventListener {
+ protected static final String QUEUE_ID_ATTRIBBUTE = "queueId";
+ protected static final String NAME_ATTRIBBUTE = "name";
+ protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger();
+
public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
UIComponent comp = event.getComponent();
FacesContext context = FacesContext.getCurrentInstance();
@@ -70,10 +74,6 @@
protected abstract String getQueueName(UIComponent comp);
- protected static final String QUEUE_ID_ATTRIBBUTE = "queueId";
- protected static final String NAME_ATTRIBBUTE = "name";
- protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger();
-
protected String findParentQueueId(UIComponent comp) {
UIComponent parentForm = findParentForm(comp);
for (UIComponent c : parentForm.getChildren()) {
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -25,8 +25,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
@@ -36,6 +36,10 @@
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
+ <modules>
+ <module>../api</module>
+ </modules>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -113,14 +117,6 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <fail>false</fail>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
<configuration>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -39,7 +39,6 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>api</module>
</modules>
<build>
@@ -52,6 +51,15 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -1,39 +1,37 @@
<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">
+ 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>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>componentControl</artifactId>
- <name>RichFaces Component Control</name>
- <packaging>jar</packaging>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>componentControl</artifactId>
+ <name>Richfaces UI Components: Component Control</name>
+ <packaging>jar</packaging>
- </dependencies>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: root/ui-sandbox/datascroller/trunk/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -23,6 +23,12 @@
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">
+ <parent>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>datascroller-aggregator</artifactId>
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -1,21 +1,39 @@
<?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>1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>components</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>richfaces components sandbox</name>
+ <name>Richfaces UI Components Sandbox Aggregator</name>
<modules>
<module>tables/trunk</module>
Modified: root/ui-sandbox/tables/trunk/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -19,14 +19,21 @@
-->
<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">
+ 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.sandbox.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Richfaces UI Components: Tables Aggregator</name>
+ <artifactId>tables-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Components: Tables Aggregator</name>
<build>
<plugins>
@@ -41,12 +48,12 @@
</plugins>
</build>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>api</module>
- <module>impl</module>
- <module>ui</module>
- </modules>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>api</module>
+ <module>impl</module>
+ <module>ui</module>
+ </modules>
</project>
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17058 - in root/ui/core/trunk: parent and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-15 03:12:11 -0400 (Sat, 15 May 2010)
New Revision: 17058
Modified:
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct pom structure
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
@@ -25,16 +25,65 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core-bom</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>core-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Archetypes dependency -->
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
<build>
<pluginManagement>
<plugins>
@@ -97,43 +146,4 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Archetypes dependency -->
- <dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
- </dependency>
-
- <!-- tests -->
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>htmlunit-client</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-test-stage</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
+++ root/ui/core/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
@@ -24,12 +24,24 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
<groupId>org.richfaces.ui</groupId>
<artifactId>core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Richfaces UI Components: Core Aggregator</name>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>api</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -43,14 +55,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>release</id>
@@ -95,10 +99,4 @@
</profile>
</profiles>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>api</module>
- </modules>
-
</project>
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r17057 - in root: build/parent/trunk and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-15 02:18:40 -0400 (Sat, 15 May 2010)
New Revision: 17057
Modified:
root/build/parent/trunk/pom.xml
root/examples-sandbox/trunk/components/pom.xml
root/examples-sandbox/trunk/components/tables/pom.xml
root/examples-sandbox/trunk/pom.xml
root/examples/pom.xml
root/pom.xml
root/ui-sandbox/pom.xml
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct pom structure
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/build/parent/trunk/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -250,7 +250,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
<configuration>
<javadocVersion>1.5</javadocVersion>
<aggregate>true</aggregate>
@@ -308,6 +307,12 @@
</profile>
</profiles>
+ <distributionManagement>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ </distributionManagement>
+
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/trunk</connection>
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/examples/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -49,25 +49,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
- <distributionManagement>
- <downloadUrl>
- http://labs.jboss.com/portal/jbossrichfaces/downloads
- </downloadUrl>
- <repository>
- <id>jboss-releases-repository</id>
- <uniqueVersion>false</uniqueVersion>
- <url>${releaseRepository}</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <uniqueVersion>true</uniqueVersion>
- <url>${snapshotRepository}</url>
- </snapshotRepository>
- <!--site>
- <url>file:target/site2</url>
- </site-->
- </distributionManagement>
-
<dependencyManagement>
<dependencies>
<dependency>
Modified: root/examples-sandbox/trunk/components/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/examples-sandbox/trunk/components/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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</groupId>
- <artifactId>examples-sandbox</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.examples-sandbox</groupId>
- <artifactId>components</artifactId>
- <packaging>pom</packaging>
- <modules>
- <module>tables</module>
- </modules>
- <dependencyManagement>
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>examples-sandbox</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.examples-sandbox</groupId>
+ <artifactId>components</artifactId>
+ <packaging>pom</packaging>
+ <name>Richfaces Examples Sandbox: Component Demos Aggregator</name>
+
+ <modules>
+ <module>tables</module>
+ </modules>
+
<dependencies>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>${example.componentName}-bom</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
- </dependencyManagement>
</project>
\ No newline at end of file
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -1,85 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.richfaces.examples-sandbox</groupId>
- <artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <example.componentName>tables</example.componentName>
- </properties>
-
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>Jboss Repository for Maven</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.examples.components</groupId>
- <artifactId>${example.componentName}-demo</artifactId>
- <packaging>war</packaging>
- <name>RichFaces core demo</name>
-
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>${example.componentName}-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>${example.componentName}-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>${example.componentName}-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>datascroller-api</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>datascroller-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
+ <parent>
+ <groupId>org.richfaces.examples-sandbox</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.examples.components</groupId>
+ <artifactId>${example.componentName}-demo</artifactId>
+ <packaging>war</packaging>
+ <name>Richfaces Sandbox Examples: Tables Demo</name>
+
+ <properties>
+ <example.componentName>tables</example.componentName>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>${example.componentName}-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>${example.componentName}-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>${example.componentName}-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>${example.componentName}-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/examples-sandbox/trunk/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -1,130 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
+ 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>
- <groupId>org.richfaces</groupId>
- <artifactId>examples-sandbox</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>richfaces sandbox components examples</name>
+ <modelVersion>4.0.0</modelVersion>
- <distributionManagement>
- <downloadUrl>
- http://labs.jboss.com/portal/jbossrichfaces/downloads
- </downloadUrl>
- <repository>
- <id>jboss-releases-repository</id>
- <uniqueVersion>false</uniqueVersion>
- <url>${releaseRepository}</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <uniqueVersion>true</uniqueVersion>
- <url>${snapshotRepository}</url>
- </snapshotRepository>
- <!--site>
- <url>file:target/site2</url>
- </site-->
- </distributionManagement>
- <dependencies>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces</groupId>
+ <artifactId>examples-sandbox</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces Sandbox Components Examples</name>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-api</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
-
- <!-- simple logger binding: only messages of level INFO and higher are printed-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version >1.5.8</version>
- </dependency>
-
- <!-- TODO: uncomment when assembly will be ready -->
- <!--dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${ui.version}</version>
- </dependency-->
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- <!--scope>provided</scope-->
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- <!--scope>provided</scope-->
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>components</module>
- </modules>
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${jetty.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- TODO: uncomment when assembly will be ready -->
+ <!--dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${ui.version}</version>
+ </dependency-->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </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>
+ </dependencies>
- <properties>
- <jetty.port>8080</jetty.port>
- </properties>
+ <modules>
+ <module>components</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <jetty.port>8080</jetty.port>
+ </properties>
</project>
\ No newline at end of file
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -9,28 +9,25 @@
<artifactId>root</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>richfaces all module aggregator</name>
+ <name>Richfaces Aggregator</name>
- <distributionManagement>
- <downloadUrl>
- http://labs.jboss.com/portal/jbossrichfaces/downloads
- </downloadUrl>
- <repository>
- <id>jboss-releases-repository</id>
- <uniqueVersion>false</uniqueVersion>
- <url>${releaseRepository}</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <uniqueVersion>true</uniqueVersion>
- <url>${snapshotRepository}</url>
- </snapshotRepository>
- <!--site>
- <url>file:target/site2</url>
- </site-->
- </distributionManagement>
-
- <modules>
+ <distributionManagement>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <uniqueVersion>false</uniqueVersion>
+ <url>${releaseRepository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <uniqueVersion>true</uniqueVersion>
+ <url>${snapshotRepository}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <modules>
<!-- These trunk settings, and this pom.xml will be removed -->
<!-- Added bom, parent, for temp integration -->
<module>build/bom/trunk</module>
@@ -42,7 +39,7 @@
<module>ui/core/${ui.svn.dir}</module>
<!--<module>ui-sandbox/${ui-sandbox.svn.dir}</module>-->
<module>examples</module>
- <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>-->
+ <module>examples-sandbox/${examples-sandbox.svn.dir}</module>
<!--<module>doc/${doc.svn.dir}</module>-->
</modules>
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -35,22 +35,6 @@
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
- <distributionManagement>
- <downloadUrl>
- http://labs.jboss.com/portal/jbossrichfaces/downloads
- </downloadUrl>
- <repository>
- <id>jboss-releases-repository</id>
- <uniqueVersion>false</uniqueVersion>
- <url>${releaseRepository}</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <uniqueVersion>true</uniqueVersion>
- <url>${snapshotRepository}</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<pluginManagement>
<plugins>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/ui/core/trunk/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -60,7 +60,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
<configuration>
<javadocVersion>1.5</javadocVersion>
<aggregate>true</aggregate>
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-14 21:13:38 UTC (rev 17056)
+++ root/ui-sandbox/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
@@ -1,120 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.richfaces</groupId>
- <artifactId>ui-version-matrix</artifactId>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>components</artifactId>
<version>4.0.0-SNAPSHOT</version>
- </parent>
+ <packaging>pom</packaging>
+ <name>richfaces components sandbox</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
- <artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>richfaces components sandbox</name>
-
- <modules>
- <module>tables/trunk</module>
- <module>datascroller/trunk</module>
+ <modules>
+ <module>tables/trunk</module>
+ <module>datascroller/trunk</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <executions>
- <execution>
- <id>generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <inherited>true</inherited>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <version>0.7</version>
- <configuration>
- <jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-api</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</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>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
<dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+
+ <!-- JSF -->
+ <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>
+ <dependency>
<groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- </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>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</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>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <inherited>true</inherited>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
16 years, 2 months
- 1
- 0