May 2010 - richfaces-svn-commits - Jboss List Archives

JBoss Rich Faces SVN: r17438 - root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 19:26:21 -0400 (Mon, 31 May 2010) New Revision: 17438 Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml Log: https://jira.jboss.org/browse/RF-8720 Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-05-31 23:24:26 UTC (rev 17437) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-05-31 23:26:21 UTC (rev 17438) @@ -27,7 +27,7 @@ <ul> <a4j:repeat value="#{carsBean.allVendors}" var="vendor"> <li><h:outputLink value="#">#{vendor} - <rfn:componentControl target="#{rfn:clientId('table')}" operation="filter" event="click"> + <rfn:componentControl target="table" operation="filter" event="click"> <f:param value="vendor"/> <f:param value="#{vendor}"/> </rfn:componentControl>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17437 - in root/ui/misc/trunk/componentcontrol/src/main: resources/META-INF/resources/script and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 19:24:26 -0400 (Mon, 31 May 2010) New Revision: 17437 Modified: root/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java root/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/resources/script/component-control.js Log: https://jira.jboss.org/browse/RF-8720 Modified: root/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java =================================================================== --- root/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-31 23:22:36 UTC (rev 17436) +++ root/ui/misc/trunk/componentcontrol/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-31 23:24:26 UTC (rev 17437) @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -33,6 +34,7 @@ import javax.faces.component.UIParameter; import javax.faces.component.behavior.ClientBehavior; import javax.faces.component.behavior.ClientBehaviorContext; +import javax.faces.context.FacesContext; import javax.faces.render.ClientBehaviorRenderer; import javax.faces.render.FacesBehaviorRenderer; import javax.faces.render.RenderKitFactory; @@ -41,6 +43,7 @@ import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.UIHashParameter; import org.richfaces.component.behavior.ComponentControlBehavior; @@ -68,8 +71,14 @@ private static final String PARAM_SELECTOR = "selector"; + private static final Pattern COMMA_SEPARATED_STRING = Pattern.compile("\\s*,\\s*"); + + private final RendererUtils utils = RendererUtils.getInstance(); + @Override public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) { + FacesContext facesContext = behaviorContext.getFacesContext(); + ComponentControlBehavior controlBehavior = (ComponentControlBehavior) behavior; JSFunctionDefinition callback = new JSFunctionDefinition(); @@ -87,12 +96,12 @@ script.append(REF_COMPONENT).append(",").append(ScriptUtils.toScript(apiFunctionParams.toArray())).append(");"); callback.addToBody(script); - String target = controlBehavior.getTarget(); + String targetSourceString = controlBehavior.getTarget(); String selector = controlBehavior.getSelector(); Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put(PARAM_CALLBACK, callback); - parameters.put(PARAM_TARGET, target); + parameters.put(PARAM_TARGET, resolveTargets(facesContext, targetSourceString)); parameters.put(PARAM_SELECTOR, selector); // execution function @@ -138,4 +147,34 @@ } return elements; } + + protected String[] resolveTargets(FacesContext context, String targetSourceString) { + if (targetSourceString == null) { + return null; + } + + //TODO nick - externalize to utility method + String[] split = COMMA_SEPARATED_STRING.split(targetSourceString); + UIComponent contextComponent = UIComponent.getCurrentComponent(context); + if (contextComponent == null) { + contextComponent = context.getViewRoot(); + } + + List<String> resultHolder = new ArrayList<String>(split.length); + + for (String target : split) { + UIComponent targetComponent = utils.findComponentFor(contextComponent, target); + + String targetClientId; + if (targetComponent != null) { + targetClientId = targetComponent.getClientId(context); + } else { + targetClientId = target; + } + + resultHolder.add(targetClientId); + } + + return resultHolder.toArray(new String[resultHolder.size()]); + } } Modified: root/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/resources/script/component-control.js =================================================================== --- root/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/resources/script/component-control.js 2010-05-31 23:22:36 UTC (rev 17436) +++ root/ui/misc/trunk/componentcontrol/src/main/resources/META-INF/resources/script/component-control.js 2010-05-31 23:24:26 UTC (rev 17437) @@ -7,15 +7,14 @@ $.extend(richfaces.ui.ComponentControl, { execute: function(event, parameters) { - var target = parameters.target; + var targetList = parameters.target; var selector = parameters.selector; var callback = parameters.callback; - if(target) { - var ids = target.split(','); - for (var i = 0; i < ids.length; i++) { - var component = document.getElementById(ids[i]); - if(component) { + if (targetList) { + for (var i = 0; i < targetList.length; i++) { + var component = document.getElementById(targetList[i]); + if (component) { richfaces.ui.ComponentControl.invokeOnComponent(event, component, callback); } }

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17436 - root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 19:22:36 -0400 (Mon, 31 May 2010) New Revision: 17436 Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datatable.js Log: Fixed filter JS API in rich:dataTable not working due to wrong arguments number Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datatable.js =================================================================== --- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-05-31 22:17:15 UTC (rev 17435) +++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-05-31 23:22:36 UTC (rev 17436) @@ -50,7 +50,7 @@ }, filter: function(columnId, filterValue, isClear) { - invoke.call(this,createParameters.call(this,richfaces.ui.DataTable.FILTERING, columnId, filterValue, isClear)); + invoke.call(this,null,createParameters.call(this,richfaces.ui.DataTable.FILTERING, columnId, filterValue, isClear)); }, expandAllSubTables: function() {

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17435 - root/core/trunk/impl/src/main/resources/META-INF.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 18:17:15 -0400 (Mon, 31 May 2010) New Revision: 17435 Removed: root/core/trunk/impl/src/main/resources/META-INF/.faces-config.xml.jsfdia root/core/trunk/impl/src/main/resources/META-INF/.svnignore root/core/trunk/impl/src/main/resources/META-INF/resources-config.xml root/core/trunk/impl/src/main/resources/META-INF/services/ Log: Legacy files removed from core/impl Deleted: root/core/trunk/impl/src/main/resources/META-INF/.faces-config.xml.jsfdia =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/.faces-config.xml.jsfdia 2010-05-31 22:15:59 UTC (rev 17434) +++ root/core/trunk/impl/src/main/resources/META-INF/.faces-config.xml.jsfdia 2010-05-31 22:17:15 UTC (rev 17435) @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PROCESS ENTITY="JSFProcess"/> Deleted: root/core/trunk/impl/src/main/resources/META-INF/.svnignore =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/.svnignore 2010-05-31 22:15:59 UTC (rev 17434) +++ root/core/trunk/impl/src/main/resources/META-INF/.svnignore 2010-05-31 22:17:15 UTC (rev 17435) @@ -1 +0,0 @@ -MANIFEST.MF Deleted: root/core/trunk/impl/src/main/resources/META-INF/resources-config.xml =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/resources-config.xml 2010-05-31 22:15:59 UTC (rev 17434) +++ root/core/trunk/impl/src/main/resources/META-INF/resources-config.xml 2010-05-31 22:17:15 UTC (rev 17435) @@ -1,140 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resource-config> - <resource class="org.ajax4jsf.javascript.AjaxScript"> - <name>org.ajax4jsf.javascript.AjaxScript</name> - </resource> - <resource class="org.ajax4jsf.javascript.SmartPositionScript"> - <name>org.ajax4jsf.javascript.SmartPositionScript</name> - </resource> - <resource class="org.ajax4jsf.javascript.AjaxScript"> - <name>ajax.js</name> - </resource> - <resource class="org.ajax4jsf.javascript.PrototypeScript"> - <name>prototype.js</name> - </resource> - <resource class="org.ajax4jsf.javascript.DnDScript"> - <name>dnd.js</name> - </resource> - <resource > - <name>form.js</name> - <path>/org/ajax4jsf/javascript/scripts/form.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource > - <name>/org/ajax4jsf/framework.pack.js</name> - <path>org/ajax4jsf/framework.pack.js</path> - <renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/> - </resource> - <resource > - <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> - <path>/org/ajax4jsf/javascript/scripts/form.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource class="org.richfaces.renderkit.html.GradientA"> - <name>org.richfaces.renderkit.html.GradientA</name> - </resource> - <resource class="org.richfaces.renderkit.html.CustomizeableGradient"> - <name>org.richfaces.renderkit.html.CustomizeableGradient</name> - </resource> - <resource class="org.richfaces.renderkit.html.images.SliderArrowImage"> - <name>org.richfaces.renderkit.html.images.SliderArrowImage</name> - </resource> - <resource class="org.richfaces.renderkit.html.BaseGradient"> - <name>org.richfaces.renderkit.html.BaseGradient</name> - </resource> - - <resource> - <name>jquery.js</name> - <path>org/richfaces/renderkit/html/scripts/jquery/jquery.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/builder.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/builder.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/effects.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/effects.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/dragdrop.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/dragdrop.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/controls.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/controls.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/slider.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/slider.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>scriptaculous/sound.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/sound.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - - <resource> - <name>scriptaculous/unittest.js</name> - <path>org/richfaces/renderkit/html/scripts/scriptaculous/unittest.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - - <resource> - <name>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</name> - <path>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - - <resource> - <name>org/richfaces/renderkit/html/scripts/jquery.utils.js</name> - <path>org/richfaces/renderkit/html/scripts/jquery.utils.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - - <resource> - <name>org/ajax4jsf/javascript/scripts/AJAX.js</name> - <path>org/ajax4jsf/javascript/scripts/AJAX.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/ajax4jsf/javascript/scripts/command.js</name> - <path>org/ajax4jsf/javascript/scripts/command.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/ajax4jsf/javascript/scripts/dnd.js</name> - <path>org/ajax4jsf/javascript/scripts/dnd.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/ajax4jsf/javascript/scripts/imagecache.js</name> - <path>org/ajax4jsf/javascript/scripts/imagecache.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/ajax4jsf/javascript/scripts/prototype.js</name> - <path>org/ajax4jsf/javascript/scripts/prototype.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/ajax4jsf/javascript/scripts/smartposition.js</name> - <path>org/ajax4jsf/javascript/scripts/smartposition.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource> - <name>org/richfaces/renderkit/html/scripts/skinning.js</name> - <path>org/richfaces/renderkit/html/scripts/skinning.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> -</resource-config>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17434 - in root/examples/richfaces-showcase/trunk/src/main: java/org/richfaces/demo/common/navigation and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 18:15:59 -0400 (Mon, 31 May 2010) New Revision: 17434 Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss Removed: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/img/ Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml Log: Added skinning bindings to richfaces-showcase Beans in richfaces-showcase made serializable Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,9 +1,14 @@ package org.richfaces.demo.common.navigation; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -public class BaseDescriptor { +public class BaseDescriptor implements Serializable { + + private static final long serialVersionUID = 5614594358147757458L; + private String id; private String name; private boolean newItem; Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,17 +1,16 @@ package org.richfaces.demo.common.navigation; -import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -public class DemoDescriptor extends BaseDescriptor implements Serializable { - /** - * - */ - private static final long serialVersionUID = 8753024677503886789L; +public class DemoDescriptor extends BaseDescriptor { + + private static final long serialVersionUID = 6822187362271025752L; + private static final String BASE_SAMPLES_DIR = "/richfaces/"; + private List<SampleDescriptor> samples; public SampleDescriptor getSampleById(String id) { Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,16 +1,14 @@ package org.richfaces.demo.common.navigation; -import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -public class GroupDescriptor extends BaseDescriptor implements Serializable{ - /** - * - */ +public class GroupDescriptor extends BaseDescriptor { + private static final long serialVersionUID = -3481702232804120885L; + private List<DemoDescriptor> demos; @XmlElementWrapper(name="demos") Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,12 +1,8 @@ package org.richfaces.demo.common.navigation; -import java.io.Serializable; -public class SampleDescriptor extends BaseDescriptor implements Serializable{ +public class SampleDescriptor extends BaseDescriptor { - /** - * - */ private static final long serialVersionUID = 2704627392818039062L; } Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -0,0 +1,27 @@ +package org.richfaces.demo.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +public class PageFooterGradient extends BaseGradient { + + private static final int HEIGHT = 96; + + public PageFooterGradient() { + super(1, HEIGHT, -1, Skin.HEADER_BACKGROUND_COLOR, Skin.GENERAL_BACKGROUND_COLOR); + } + + @Override + protected void paintGradient(Graphics2D g2d, Dimension dim) { + Dimension halfHeightDim = new Dimension(); + halfHeightDim.setSize(dim.getWidth(), dim.getHeight() / 2); + super.paintGradient(g2d, halfHeightDim); + AffineTransform transform = new AffineTransform(1, 0, 0, -1, 0, HEIGHT); + g2d.transform(transform); + super.paintGradient(g2d, halfHeightDim); + } +} Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -0,0 +1,10 @@ +package org.richfaces.demo.images; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +public class PageHeaderGradient extends BaseGradient { + public PageHeaderGradient() { + super(1, 80, 30, Skin.HEADER_BACKGROUND_COLOR, Skin.HEADER_GRADIENT_COLOR); + } +} Added: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -0,0 +1,10 @@ +package org.richfaces.demo.images; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +public class PanelGradient extends BaseGradient { + public PanelGradient() { + super(30, 50, 20, Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR); + } +} \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,8 +1,12 @@ package org.richfaces.demo.tables.model.cars; +import java.io.Serializable; import java.math.BigDecimal; -public class InventoryVendorItem { +public class InventoryVendorItem implements Serializable { + + private static final long serialVersionUID = -5424674835711375626L; + BigDecimal activity; BigDecimal changePrice; BigDecimal changeSearches; Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,9 +1,12 @@ package org.richfaces.demo.tables.model.cars; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class InventoryVendorList { +public class InventoryVendorList implements Serializable { + private static final long serialVersionUID = -6547391197128734913L; + private String vendor; private List<InventoryVendorItem> vendorItems; Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,77 +0,0 @@ -.rich-page{width:100%;} -.body{ - background: #FFFFFF; - margin:0px; -} -*{ - font-size:11px; -} -.header_bg{ - background-image:url(#{resource['rich/img/header_background.png']}); - border-bottom:1px solid; - border-bottom-color:#FFFFFF; - background-color:#BED6F8; - background-repeat:repeat-x; - background-position:top left; -} - -.footer_bg{ - background-image:url(#{resource['rich/img/footer_background.png']}); - border-top:1px solid; - border-top-color:#FFFFFF; - background-color:#BED6F8; - background-repeat:repeat-x; - background-position:center left; -} - -.menu_col{ - background:#FFFFFF; - vertical-align:top; - border-top:2px solid; - border-top-color:#BED6F8; - border-right:2px solid; - border-right-color:#BED6F8; - border-bottom:2px solid; - border-bottom-color:#BED6F8; -} - -.content_col{ - background:#FFFFFF; - vertical-align:top; - width:100%; - border-top:2px solid; - border-top-color:#BED6F8; - border-bottom:2px solid; - border-bottom-color:#BED6F8; -} -*.menu_col, *.content_col, *.footer_bg{ - font-family:Arial, Verdana, sans-serif ; - color:#000000; - font-size:11px; -} -*.header_content{ - font-family:Arial, Verdana, sans-serif; - color:#000000; - font-size:11px; -} - - -.page_size { - width : 100% - height : 100% -} - - -.header_content { - margin : 0px 0px 0px 0px - height : 95px position : relative -} - -.spacer{font-size : 1px} - - -.footer_bg_content { - margin : 0px 0px 0px 0px - height : 45px - position : relative -} \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss (from rev 17432, root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-05-31 22:15:59 UTC (rev 17434) @@ -0,0 +1,80 @@ +.rich-page{ + width:100%; +} + +.body { + background-color: '#{richSkin.generalBackgroundColor}'; + margin: 0px; +} + +* { + font-size: 11px; +} + +.header_bg{ + background-image: "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})"; + border-bottom: 1px solid #FFFFFF; + background-color: '#{richSkin.headerBackgroundColor}'; + background-repeat: repeat-x; + background-position: top left; +} + +.footer_bg{ + background-image: "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})"; + border-top: 1px solid #FFFFFF; + background-color: '#{richSkin.headerBackgroundColor}'; + background-repeat:repeat-x; + background-position:center left; +} + +.menu_col{ + background-color: '#{richSkin.generalBackgroundColor}'; + vertical-align:top; + border-top:2px solid; + border-top-color: '#{richSkin.panelBorderColor}'; + border-right:2px solid; + border-right-color: '#{richSkin.panelBorderColor}'; + border-bottom:2px solid; + border-bottom-color: '#{richSkin.panelBorderColor}'; +} + +.content_col{ + background-color: '#{richSkin.generalBackgroundColor}'; + vertical-align:top; + width: 100%; + border-top:2px solid; + border-top-color: '#{richSkin.panelBorderColor}'; + border-bottom:2px solid; + border-bottom-color: '#{richSkin.panelBorderColor}'; +} +*.menu_col, *.content_col, *.footer_bg { + font-family: Arial, Verdana, sans-serif; + color: '#{richSkin.generalTextColor}'; + font-size: 11px; +} +*.header_content{ + font-family: Arial, Verdana, sans-serif; + color: '#{richSkin.headerTextColor}'; + font-size: 11px; +} + +.page_size { + width: 100%; + height: 100%; +} + + +.header_content { + margin: 0px 0px 0px 0px; + position : relative +} + +.spacer{ + font-size : 1px; +} + +.footer_bg_content { + margin: 0px 0px 0px 0px; + height: 45px; + position: relative; +} \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css 2010-05-31 22:15:59 UTC (rev 17434) @@ -1,26 +0,0 @@ -.rich-panel{ - border-width: 1px; - border-style: solid; - padding : 1px; - color:#000000; - font-family:Arial,Verdana,sans-serif; - font-size:11px; - background-color:#FFFFFF; - border-color:#BED6F8; -} - -.rich-panel-header{ - padding : 2px; - border-width: 1px; - border-style: solid; - background-color:#BED6F8; - border-color:#BED6F8; - font-weight:bold; - background-position:left top; - background-repeat:repeat-x; - background-image: url(#{resource['rich/img/panel_header.png']}) -} - -.rich-panel-body{ - padding : 10px; -} Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss (from rev 17425, root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-05-31 22:15:59 UTC (rev 17434) @@ -0,0 +1,27 @@ +.rich-panel{ + border-width: 1px; + border-style: solid; + padding : 1px; + color: '#{richSkin.generalTextColor}'; + font-family:Arial,Verdana,sans-serif; + font-size:11px; + background-color: '#{richSkin.generalBackgroundColor}'; + border-color: '#{richSkin.panelBorderColor}'; +} + +.rich-panel-header{ + padding : 2px; + border-width: 1px; + border-style: solid; + background-color: '#{richSkin.headerBackgroundColor}'; + border-color: '#{richSkin.panelBorderColor}'; + font-weight:bold; + background-position:left top; + background-repeat:repeat-x; + background-image: "url(#{resource['org.richfaces.demo.images.PanelGradient']})"; + color: '#{richSkin.headerTextColor}'; +} + +.rich-panel-body{ + padding : 10px; +} Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml 2010-05-31 22:15:59 UTC (rev 17434) @@ -26,7 +26,7 @@ <composite:renderFacet name="pageHeader"/> </h:head> <h:body> - <h:outputStylesheet name="rich/css/page.css" /> + <h:outputStylesheet name="rich/css/page.ecss" /> <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> <tbody> <tr> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml 2010-05-31 22:15:59 UTC (rev 17434) @@ -20,7 +20,7 @@ </composite:interface> <composite:implementation> - <h:outputStylesheet name="rich/css/panel.css" /> + <h:outputStylesheet name="rich/css/panel.ecss" /> <div class="rich-panel #{cc.attrs.styleClass}" id="#{cc.attrs.id}" style="#{cc.attrs.style}" Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-05-31 21:03:08 UTC (rev 17433) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-05-31 22:15:59 UTC (rev 17434) @@ -12,7 +12,7 @@ <title>Components Gallery</title> </h:head> <h:body> - <h:outputStylesheet name="rich/css/page.css" /> + <h:outputStylesheet name="rich/css/page.ecss" /> <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> <tbody>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17433 - in root/examples/richfaces-showcase/trunk/src/main/webapp: templates/includes and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-31 17:03:08 -0400 (Mon, 31 May 2010) New Revision: 17433 Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml Log: Small design changes in richfaces-showcase Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-31 19:45:56 UTC (rev 17432) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-31 21:03:08 UTC (rev 17433) @@ -14,13 +14,15 @@ </f:metadata> </ui:define> <ui:define name="body"> - <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status"> - <h:link value="#{s.name}" includeViewParams="true"> - <f:param name="sample" value="#{s.id}" /> - <f:attribute name="style" value="#{(s.id == demoNavigator.currentSample.id) ? 'color:orange' : ''}"/> - </h:link> - <h:outputText value=" | " /> - </ui:repeat> + <rich:panel> + <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status"> + <h:link value="#{s.name}" includeViewParams="true"> + <f:param name="sample" value="#{s.id}" /> + <f:attribute name="style" value="#{(s.id == demoNavigator.currentSample.id) ? 'color:orange' : ''}"/> + </h:link> + <h:outputText value=" | " rendered="#{not status.last}" /> + </ui:repeat> + </rich:panel> <fieldset><legend>#{demoNavigator.currentSample.name}</legend> <ui:include src="#{demoNavigator.sampleURI}" /></fieldset> </ui:define> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-05-31 19:45:56 UTC (rev 17432) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-05-31 21:03:08 UTC (rev 17433) @@ -8,12 +8,12 @@ <ui:composition> <rich:panel> - <a4j:repeat var="skin" value="#{skinBean.skins}"> + <a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus"> <h:link value="#{skin}" includeViewParams="true"> <f:param name="skin" value="#{skin}"/> <f:attribute name="style" value="#{(skin==skinBean.skin) ? 'color:orange' : ''}"/> </h:link> - <h:outputText value = " | "/> + <h:outputText value = " | " rendered="#{not iterStatus.last}" /> </a4j:repeat> </rich:panel> </ui:composition>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17432 - in root: ui/dist/trunk/richfaces-components-api and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-05-31 15:45:56 -0400 (Mon, 31 May 2010) New Revision: 17432 Modified: root/dist/trunk/readme-examples.txt root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml Log: fix problem with aggregation of ui modules Modified: root/dist/trunk/readme-examples.txt =================================================================== --- root/dist/trunk/readme-examples.txt 2010-05-31 19:30:38 UTC (rev 17431) +++ root/dist/trunk/readme-examples.txt 2010-05-31 19:45:56 UTC (rev 17432) @@ -12,7 +12,7 @@ 1) execute "mvn install" in root application folder(examples/richfaces-showcase) 2) Deploy to tomcat 6.x or just run using maven on jetty using "mvn jetty:run-war" -For JEE5 application server: +For JEE6 application server: 1) execute "mvn install -P jee6" in root application folder(examples/richfaces-showcase) 2) Deploy to Jboss 4.x or higher or some other jee6 application servers. 3) Do not forget to change the JSF implementation shipped with application server to JSF 2 (latest SNAPSHOT) Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -126,7 +126,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*</include> + <include>${assembly.projects.group}:*-api:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -154,7 +154,7 @@ <configuration> <artifactSet> <includes> - <include>org.richfaces.ui:*</include> + <include>org.richfaces.ui:*-impl:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -149,8 +149,7 @@ <configuration> <artifactSet> <includes> - <include>org.richfaces.ui:*</include> - <include>org.richfaces.ui-sandbox:*</include> + <include>org.richfaces.ui:*-ui:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -91,7 +91,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*</include> + <include>${assembly.projects.group}:*-api:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -86,7 +86,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*</include> + <include>${assembly.projects.group}:*-impl:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -91,7 +91,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*</include> + <include>${assembly.projects.group}:*-ui:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml =================================================================== --- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-31 19:30:38 UTC (rev 17431) +++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-31 19:45:56 UTC (rev 17432) @@ -92,7 +92,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*</include> + <include>${assembly.projects.group}:*-ui:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17431 - root/dist/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-05-31 15:30:38 -0400 (Mon, 31 May 2010) New Revision: 17431 Modified: root/dist/trunk/readme-examples.txt Log: RFPL-606 Rename "jee5" profile into "jee6" Modified: root/dist/trunk/readme-examples.txt =================================================================== --- root/dist/trunk/readme-examples.txt 2010-05-31 18:40:50 UTC (rev 17430) +++ root/dist/trunk/readme-examples.txt 2010-05-31 19:30:38 UTC (rev 17431) @@ -13,8 +13,8 @@ 2) Deploy to tomcat 6.x or just run using maven on jetty using "mvn jetty:run-war" For JEE5 application server: -1) execute "mvn install -P jee5" in root application folder(examples/richfaces-showcase) -2) Deploy to Jboss 4.x or higher or some other jee5 application servers. +1) execute "mvn install -P jee6" in root application folder(examples/richfaces-showcase) +2) Deploy to Jboss 4.x or higher or some other jee6 application servers. 3) Do not forget to change the JSF implementation shipped with application server to JSF 2 (latest SNAPSHOT) To build both archives execute "mvn install -P release"

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17430 - in root/examples: richfaces-showcase/trunk and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-05-31 14:40:50 -0400 (Mon, 31 May 2010) New Revision: 17430 Modified: root/examples/pom.xml root/examples/richfaces-showcase/trunk/pom.xml Log: RFPL-606 Rename "jee5" profile into "jee6" Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-31 18:04:56 UTC (rev 17429) +++ root/examples/pom.xml 2010-05-31 18:40:50 UTC (rev 17430) @@ -118,7 +118,7 @@ <profiles> <profile> - <id>jee5</id> + <id>jee6</id> <dependencies> <dependency> <groupId>${jsf2.api.groupid}</groupId> Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-31 18:04:56 UTC (rev 17429) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-31 18:40:50 UTC (rev 17430) @@ -73,19 +73,16 @@ <artifactId>maven-war-plugin</artifactId> <executions> <execution> - <id>jee5</id> + <id>jee6</id> <phase>package</phase> <goals> <goal>war</goal> </goals> <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5 - </webappDirectory> - <classifier>jee5</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-* - </packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-* - </warSourceExcludes> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> </configuration> </execution> </executions> @@ -131,14 +128,13 @@ </build> </profile> <profile> - <id>jee5</id> + <id>jee6</id> <build> <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee5 - </webappDirectory> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> </configuration> </plugin> </plugins>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17429 - root/dist/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-05-31 14:04:56 -0400 (Mon, 31 May 2010) New Revision: 17429 Modified: root/dist/trunk/pom.xml root/dist/trunk/richfaces.xml Log: add archetype to root assembler Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-05-31 16:26:03 UTC (rev 17428) +++ root/dist/trunk/pom.xml 2010-05-31 18:04:56 UTC (rev 17429) @@ -35,21 +35,6 @@ <packaging>pom</packaging> <name>Richfaces Assembler</name> - <modules> -  -  -  - -  -  - -  -  - -  -  - </modules> - <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> @@ -96,6 +81,13 @@ <type>war</type> <classifier>tomcat6</classifier> </dependency> + +  + <dependency> + <groupId>org.richfaces.archetypes</groupId> + <artifactId>richfaces-archetype-simpleapp</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> </dependencies> <build> @@ -173,6 +165,20 @@ <stripVersion>true</stripVersion> </configuration> </execution> + + <execution> + <id>copy-archetypes</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + + <phase>package</phase> + <configuration> + <includeGroupIds>org.richfaces.archetypes</includeGroupIds> + <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> + <stripVersion>true</stripVersion> + </configuration> + </execution> </executions> </plugin> Modified: root/dist/trunk/richfaces.xml =================================================================== --- root/dist/trunk/richfaces.xml 2010-05-31 16:26:03 UTC (rev 17428) +++ root/dist/trunk/richfaces.xml 2010-05-31 18:04:56 UTC (rev 17429) @@ -1,3 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> @@ -2,3 +21,3 @@ <formats> - <format>dir</format> + <format>zip</format> </formats> @@ -94,28 +113,11 @@ <exclude>/META-INF/**</exclude> </excludes> </fileSet> + +  + <fileSet> + <directory>target/dependency/richfaces-archetype-simpleapp-jar/archetype-resources</directory> + <outputDirectory>archetypes/richfaces-archetype-simpleapp/</outputDirectory> + </fileSet> </fileSets> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - <includes> - <include>org.richfaces.archetypes:*</include> - </includes> - - <sources> - <outputDirectoryMapping>archetypes/${module.artifactId}</outputDirectoryMapping> - <excludeSubModuleDirectories>false</excludeSubModuleDirectories> - <fileSets> - <fileSet> - <includes> - <include>src/**</include> - <include>readme.txt</include> - <include>pom.xml</include> - </includes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - </moduleSets> </assembly> \ No newline at end of file

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2010