JBoss Rich Faces SVN: r6468 - trunk/sandbox/ui.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 14:15:59 -0500 (Fri, 29 Feb 2008)
New Revision: 6468
Removed:
trunk/sandbox/ui/calendar/
trunk/sandbox/ui/listShuttle/
Log:
garbage folders removed
16 years, 9 months
JBoss Rich Faces SVN: r6467 - in trunk/framework: api/src/main/java/org/richfaces/skin and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 14:14:12 -0500 (Fri, 29 Feb 2008)
New Revision: 6467
Added:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ImportResourceElement.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java
trunk/framework/impl/src/main/java/org/ajax4jsf/util/Zipper2.java
Log:
http://jira.jboss.com/jira/browse/RF-2138
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-29 18:58:50 UTC (rev 6466)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -43,11 +43,23 @@
public static final String LOAD_ALL = "ALL";
public static final String COMMON_FRAMEWORK_SCRIPT = "/org/ajax4jsf/framework.pack.js";
public static final String COMMON_UI_SCRIPT = "/org/richfaces/ui.pack.js";
- public static final String COMMON_STYLE = "/org/richfaces/skin.xcss";
+ public static final String COMMON_STYLE_PREFIX = "/org/richfaces/skin";
+ public static final String COMMON_STYLE_EXTENSION = ".xcss";
+ public static final String COMMON_STYLE = COMMON_STYLE_PREFIX + COMMON_STYLE_EXTENSION;
public static final String LOAD_STYLE_STRATEGY_PARAM = "org.richfaces.LoadStyleStrategy";
public static final String LOAD_SCRIPT_STRATEGY_PARAM = "org.richfaces.LoadScriptStrategy";
- /**
+ public static final String STD_CONTROLS_SKINNING_PARAM = "org.richfaces.CONTROL_SKINNING";
+ public static final String STD_CONTROLS_SKINNING_CLASSES_PARAM = "org.richfaces.CONTROL_SKINNING_CLASSES";
+ public static final String ENABLE = "enable";
+
+ public static final String STD_CONTROLS_BASIC_STYLE = "/org/richfaces/renderkit/html/css/basic.xcss";
+ public static final String STD_CONTROLS_BASIC_CLASSES_STYLE = "/org/richfaces/renderkit/html/css/basic_classes.xcss";
+
+ public static final String STD_CONTROLS_EXTENDED_STYLE = "/org/richfaces/renderkit/html/css/extended.xcss";
+ public static final String STD_CONTROLS_EXTENDED_CLASSES_STYLE = "/org/richfaces/renderkit/html/css/extended_classes.xcss";
+
+ /**
* Get application start time for check resources modification time.
*
* @return application start time in msec's
Modified: trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java 2008-02-29 18:58:50 UTC (rev 6466)
+++ trunk/framework/api/src/main/java/org/richfaces/skin/Skin.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -241,6 +241,14 @@
public static final String panelTextColor = "panelTextColor";
+ public static final String headerGradientColor = "headerGradientColor";
+
+ public static final String additionalBackgroundColor = "additionalBackgroundColor";
+
+ public static final String controlBackgroundColor = "controlBackgroundColor";
+
+ public static final String generalSizeFont = "generalSizeFont";
+
public static final String loadStyleSheets = "loadStyleSheets";
// Preferable parameters
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-02-29 18:58:50 UTC (rev 6466)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -32,6 +32,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
@@ -77,8 +78,13 @@
*
*/
public class AjaxContextImpl extends AjaxContext {
+
public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED";
+ //we do not apply extended CSS styling for control for Opera & Safari
+ //as they have their own advanced styling
+ private static final Pattern USER_AGENTS = Pattern.compile(" AppleWebKit/|^Opera/| Opera ");
+
private static final Log log = LogFactory.getLog(AjaxContext.class);
private static ComponentInvoker invoker;
@@ -409,29 +415,95 @@
}
}
}
+
+ boolean useStdControlsSkinning = false;
+
+ String stdControlsSkinning = externalContext.getInitParameter(InternetResourceBuilder.STD_CONTROLS_SKINNING_PARAM);
+ if (stdControlsSkinning != null && stdControlsSkinning.length() != 0) {
+ useStdControlsSkinning = InternetResourceBuilder.ENABLE.equals(stdControlsSkinning);
+ }
+
+ boolean useStdControlsSkinningClasses = true;
+
+ String stdControlsSkinningClasses = externalContext.getInitParameter(InternetResourceBuilder.STD_CONTROLS_SKINNING_CLASSES_PARAM);
+ if (stdControlsSkinningClasses != null && stdControlsSkinningClasses.length() != 0) {
+ useStdControlsSkinningClasses = InternetResourceBuilder.ENABLE.equals(stdControlsSkinningClasses);
+ }
+
+ boolean useExtendedSkinning = isExtendedSkinningEnabled(externalContext);
+
String styleStrategy = externalContext
.getInitParameter(InternetResourceBuilder.LOAD_STYLE_STRATEGY_PARAM);
- if (null != styleStrategy) {
- if (InternetResourceBuilder.LOAD_NONE.equals(styleStrategy)) {
- viewResources.setProcessStyles(false);
- } else if (InternetResourceBuilder.LOAD_ALL
- .equals(styleStrategy)) {
- viewResources.setProcessStyles(false);
- try {
- viewResources
- .addStyle(internetResourceBuilder
- .createResource(
- this,
- InternetResourceBuilder.COMMON_STYLE)
- .getUri(context, null));
+
+ if (InternetResourceBuilder.LOAD_NONE.equals(styleStrategy)) {
+ viewResources.setProcessStyles(false);
+ } else if (InternetResourceBuilder.LOAD_ALL
+ .equals(styleStrategy)) {
+ viewResources.setProcessStyles(false);
+
+ String commonStyle = InternetResourceBuilder.COMMON_STYLE_PREFIX;
+
+ if (useStdControlsSkinning || useStdControlsSkinningClasses) {
+ if (useExtendedSkinning) {
+ commonStyle += "-ext";
+ } else {
+ commonStyle += "-bas";
+ }
- } catch (ResourceNotFoundException e) {
- if(log.isWarnEnabled()){
- log.warn("No aggregated stylesheet found "+e.getMessage());
- }
+ if (useStdControlsSkinning && useStdControlsSkinningClasses) {
+ commonStyle += "-both";
+ } else if (useStdControlsSkinning) {
+ commonStyle += "-styles";
+ } else if (useStdControlsSkinningClasses) {
+ commonStyle += "-classes";
}
}
+
+ commonStyle += InternetResourceBuilder.COMMON_STYLE_EXTENSION;
+
+ try {
+ viewResources
+ .addStyle(internetResourceBuilder
+ .createResource(
+ this,
+ commonStyle)
+ .getUri(context, null));
+
+ } catch (ResourceNotFoundException e) {
+ if(log.isWarnEnabled()){
+ log.warn("No aggregated stylesheet found "+e.getMessage());
+ }
+ }
+ } else {
+ if (useStdControlsSkinning) {
+ viewResources.addStyle(
+ internetResourceBuilder.createResource(
+ this, InternetResourceBuilder.STD_CONTROLS_BASIC_STYLE)
+ .getUri(context, null));
+
+ if (useExtendedSkinning) {
+ viewResources.addStyle(
+ internetResourceBuilder.createResource(
+ this, InternetResourceBuilder.STD_CONTROLS_EXTENDED_STYLE)
+ .getUri(context, null));
+ }
+ }
+
+ if (useStdControlsSkinningClasses) {
+ viewResources.addStyle(
+ internetResourceBuilder.createResource(
+ this, InternetResourceBuilder.STD_CONTROLS_BASIC_CLASSES_STYLE)
+ .getUri(context, null));
+
+ if (useExtendedSkinning) {
+ viewResources.addStyle(
+ internetResourceBuilder.createResource(
+ this, InternetResourceBuilder.STD_CONTROLS_EXTENDED_CLASSES_STYLE)
+ .getUri(context, null));
+ }
+ }
}
+
viewResources.collect(context);
Set scripts = viewResources.getScripts();
if (scripts.size() > 0) {
@@ -799,4 +871,23 @@
this.oncomplete = oncomplete;
}
+ private boolean isExtendedSkinningEnabled(ExternalContext context) {
+ String userAgent = context.getRequestHeaderMap().get("User-Agent");
+ if (userAgent != null) {
+ boolean apply = !USER_AGENTS.matcher(userAgent).find();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Got User-Agent: " + userAgent);
+ log.debug("Applying extended CSS controls styling = " + apply);
+ }
+
+ return apply;
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("User-Agent is null, applying extended CSS controls styling");
+ }
+
+ return true;
+ }
+ }
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-29 18:58:50 UTC (rev 6466)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -37,6 +37,7 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.renderkit.RendererBase;
import org.ajax4jsf.resource.util.URLToStreamHelper;
+import org.apache.commons.digester.AbstractObjectCreationFactory;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.RulesBase;
@@ -44,6 +45,7 @@
import org.apache.commons.digester.SetPropertiesRule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.LocatorImpl;
@@ -77,6 +79,7 @@
public static final String CHILD_PARAM_METHOD = "addParameter";
public static final String ANY_PARENT = "*/";
public static final String SELECTOR_TAG = "selector";
+ public static final String IMPORT_RESOURCE_TAG = "importResource";
private static final Log log = LogFactory.getLog(HtmlCompiler.class);
@@ -181,6 +184,30 @@
digestr.addObjectCreate(pattern,IfElement.class);
digestr.addSetProperties(pattern);
digestr.addSetNext(pattern,CHILD_METHOD);
+ // resources import <f:resourceImport src="...">
+ pattern = ANY_PARENT+NS_PREFIX+IMPORT_RESOURCE_TAG;
+ digestr.addFactoryCreate(pattern, new AbstractObjectCreationFactory() {
+
+ public Object createObject(Attributes attributes) throws Exception {
+
+ if (attributes == null) {
+ throw new IllegalArgumentException("Attributes set is null for " +
+ IMPORT_RESOURCE_TAG +
+ " element. Can not obtain required 'src' attribute!");
+ }
+
+ String value = attributes.getValue("src");
+ if (value == null || value.length() == 0) {
+ throw new IllegalArgumentException("Missing required 'src' attribute for " +
+ IMPORT_RESOURCE_TAG +
+ " element!");
+ }
+
+ return new ImportResourceElement(value);
+ }
+
+ });
+ digestr.addSetNext(pattern,CHILD_METHOD);
// facet <u:insertFacet name="name">
pattern = ANY_PARENT+NS_UTIL_PREFIX+FACET_TAG;
digestr.addObjectCreate(pattern,FacetElement.class);
Added: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ImportResourceElement.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ImportResourceElement.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/ImportResourceElement.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -0,0 +1,71 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.ajax4jsf.renderkit.compiler;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.renderkit.RendererBase;
+
+
+/**
+ * Created 27.02.2008
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class ImportResourceElement extends ElementBase {
+
+ private PreparedTemplate template;
+
+ public ImportResourceElement(String source) {
+ template = HtmlCompiler.compileResource(source);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.renderkit.compiler.PreparedTemplate#getTag()
+ */
+ public String getTag() {
+ return HtmlCompiler.NS_PREFIX+HtmlCompiler.IMPORT_RESOURCE_TAG;
+ }
+
+ public void encode(RendererBase renderer, FacesContext context,
+ UIComponent component) throws IOException {
+ template.encode(renderer, context, component);
+ }
+
+ public void encode(TemplateContext context, String breakPoint)
+ throws IOException {
+ template.encode(context, breakPoint);
+ }
+
+ public void encode(TemplateContext context) throws IOException {
+ template.encode(context);
+ }
+
+ public Object getValue(TemplateContext context) {
+ return template.getValue(context);
+ }
+
+}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/util/Zipper2.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/util/Zipper2.java 2008-02-29 18:58:50 UTC (rev 6466)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/Zipper2.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -101,4 +101,8 @@
offset += 4;
return i;
}
+
+ public boolean hasMore() {
+ return offset < buffer.length;
+ }
}
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -0,0 +1,206 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.GifRenderer;
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.Java2Dresource;
+import org.ajax4jsf.resource.ResourceContext;
+import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.HtmlDimensions;
+import org.ajax4jsf.util.Zipper2;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * Created 23.02.2008
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class BaseControlBackgroundImage extends Java2Dresource {
+
+ private static final Dimension DIMENSION = new Dimension(1, 1);
+
+ private String baseColor;
+ private String gradientColor;
+ private int width;
+
+ public BaseControlBackgroundImage(String baseColor, String gradientColor, int width) {
+ super();
+
+ this.baseColor = baseColor;
+ this.gradientColor = gradientColor;
+ this.width = width;
+
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ Data d = (Data) data;
+ if (d != null) {
+ return new Dimension(width, d.height.intValue());
+ } else {
+ return DIMENSION;
+ }
+ }
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return getDimensions(null, restoreData(resourceContext));
+ }
+
+ protected void paint(ResourceContext resourceContext, Graphics2D g2d) {
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ Data dataToStore = (Data) restoreData(resourceContext);
+ if (dataToStore != null && dataToStore.headerBackgroundColor!=null && dataToStore.headerGradientColor!=null) {
+ Color baseColor = new Color(dataToStore.headerBackgroundColor.intValue());
+ Dimension dim = getDimensions(resourceContext);
+ Rectangle2D rect =
+ new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ dim.height);
+ Color alternateColor = new Color(dataToStore.headerGradientColor.intValue());
+ GradientPaint gragient = new GradientPaint(0, 0, baseColor, 0, dim.height, alternateColor);
+ g2d.setPaint(gragient);
+ g2d.fill(rect);
+ }
+ }
+
+ protected Object deserializeData(byte[] objectArray) {
+ Data data = new Data();
+ if (objectArray != null) {
+ Zipper2 zipper2 = new Zipper2(objectArray);
+ data.headerBackgroundColor = new Integer(zipper2.nextIntColor());
+ data.headerGradientColor = new Integer(zipper2.nextIntColor());
+ data.height = new Integer(zipper2.nextInt());
+ }
+
+ return data;
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+ if (baseColor == null) {
+ return new Data(context).toByteArray();
+ } else {
+ return new Data(context, baseColor, gradientColor).toByteArray();
+ }
+ }
+
+ public boolean isCacheable() {
+ return true;
+ }
+
+ protected static class Data implements Serializable {
+ public Data() {
+ }
+
+ protected Data(FacesContext context) {
+ this(context, Skin.headerBackgroundColor, "headerGradientColor");
+ }
+
+ protected Data(FacesContext context, String baseColor, String gradientColor) {
+ this.headerBackgroundColor = getColorValueParameter(context, baseColor, false);
+ this.headerGradientColor = getColorValueParameter(context, gradientColor, false);
+ this.height = getHeight(context);
+
+ if (!(this.headerBackgroundColor == null && this.headerGradientColor == null)) {
+ if (this.headerBackgroundColor == null) {
+ this.headerBackgroundColor = getColorValueParameter(context, baseColor, true);
+ }
+
+ if (this.headerGradientColor == null) {
+ this.headerGradientColor = getColorValueParameter(context, gradientColor, true);
+ }
+ }
+ }
+
+ private Integer getHeight(FacesContext context) {
+ SkinFactory skinFactory = SkinFactory.getInstance();
+ Skin skin = skinFactory.getSkin(context);
+
+ String height = (String) skin.getParameter(context, Skin.generalSizeFont);
+ if (height == null || height.length() == 0) {
+ skin = skinFactory.getDefaultSkin(context);
+ height = (String) skin.getParameter(context, Skin.generalSizeFont);
+ }
+
+ if (height != null && height.length() != 0) {
+ return Integer.valueOf(HtmlDimensions.decode(height).intValue());
+ } else {
+ return Integer.valueOf(16);
+ }
+ }
+
+ private Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) {
+ Skin skin;
+ if (useDefault) {
+ skin = SkinFactory.getInstance().getDefaultSkin(context);
+ } else {
+ skin = SkinFactory.getInstance().getSkin(context);
+ }
+
+ String tmp = (String) skin.getParameter(context,name);
+ if (tmp!=null && tmp.length() != 0) {
+ return new Integer(HtmlColor.decode(tmp).getRGB());
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1732700513743861250L;
+ protected Integer headerBackgroundColor;
+ protected Integer headerGradientColor;
+ protected Integer height;
+ public byte[] toByteArray() {
+ if (headerBackgroundColor != null && headerGradientColor != null) {
+ byte[] ret = new byte[10];
+ new Zipper2(ret).
+ addColor(headerBackgroundColor.intValue()).
+ addColor(headerGradientColor.intValue()).
+ addInt(height);
+ return ret;
+ } else {
+ return null;
+ }
+ }
+ }
+
+}
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -0,0 +1,36 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import org.richfaces.skin.Skin;
+
+/**
+ * Created 23.02.2008
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class ButtonBackgroundImage extends BaseControlBackgroundImage {
+ public ButtonBackgroundImage() {
+ super(Skin.headerGradientColor, Skin.headerBackgroundColor, 1);
+ }
+}
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java 2008-02-29 19:14:12 UTC (rev 6467)
@@ -0,0 +1,38 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import org.richfaces.skin.Skin;
+
+/**
+ * Created 23.02.2008
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class InputBackgroundImage extends BaseControlBackgroundImage {
+
+ public InputBackgroundImage() {
+ super(Skin.additionalBackgroundColor, Skin.controlBackgroundColor, 2000);
+ }
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r6466 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2008-02-29 13:58:50 -0500 (Fri, 29 Feb 2008)
New Revision: 6466
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
showControls corrected
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-29 18:45:14 UTC (rev 6465)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-29 18:58:50 UTC (rev 6466)
@@ -41,13 +41,13 @@
if (this.bar) {
if (this.bar.ok) {
- this.bar.ok.observe("click", function(e){this.okHandler(e);}.bindAsEventListener(this));
+ this.bar.ok.observe("mousedown", function(e){this.okHandler(e);}.bindAsEventListener(this));
}
if (this.bar.cancel) {
- this.bar.cancel.observe("click", function(e){this.cancelHandler(e)}.bindAsEventListener(this));
+ this.bar.cancel.observe("mousedown", function(e){this.cancelHandler(e)}.bindAsEventListener(this));
}
- this.bar.bar.observe("mousedown", function(e){this.barMouseDownHandler(e);}.bindAsEventListener(this));
+ //this.bar.bar.observe("mousedown", function(e){this.barMouseDownHandler(e);}.bindAsEventListener(this));
}
this.tabber.observe("focus", function(e){this.switchingStatesHandler(e);}.bindAsEventListener(this));
@@ -145,9 +145,9 @@
}
},
- barMouseDownHandler : function(e) {
+ /*barMouseDownHandler : function(e) {
this.clickOnBar = true;
- },
+ },*/
okHandler : function(e) {
this.inputProcessing();
16 years, 9 months
JBoss Rich Faces SVN: r6465 - trunk/samples.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 13:45:14 -0500 (Fri, 29 Feb 2008)
New Revision: 6465
Modified:
trunk/samples/createProject.bat
trunk/samples/createProject.sh
Log:
project creation scripts updated
Modified: trunk/samples/createProject.bat
===================================================================
--- trunk/samples/createProject.bat 2008-02-29 18:44:21 UTC (rev 6464)
+++ trunk/samples/createProject.bat 2008-02-29 18:45:14 UTC (rev 6465)
@@ -1 +1 @@
-mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1
\ No newline at end of file
+mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.2.0-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1
\ No newline at end of file
Modified: trunk/samples/createProject.sh
===================================================================
--- trunk/samples/createProject.sh 2008-02-29 18:44:21 UTC (rev 6464)
+++ trunk/samples/createProject.sh 2008-02-29 18:45:14 UTC (rev 6465)
@@ -1,3 +1,3 @@
#!/bin/sh
-mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \
- -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=$1
\ No newline at end of file
+mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \
+ -DarchetypeVersion=3.2.0-SNAPSHOT -DgroupId=org.richfaces -DartifactId=$1
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r6464 - in trunk/samples: richfaces-demo/src/main/webapp/WEB-INF and 7 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 13:44:21 -0500 (Fri, 29 Feb 2008)
New Revision: 6464
Added:
trunk/samples/stdcomponents-sample/
trunk/samples/stdcomponents-sample/pom.xml
trunk/samples/stdcomponents-sample/src/
trunk/samples/stdcomponents-sample/src/main/
trunk/samples/stdcomponents-sample/src/main/webapp/
trunk/samples/stdcomponents-sample/src/main/webapp/META-INF/
trunk/samples/stdcomponents-sample/src/main/webapp/META-INF/MANIFEST.MF
trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/
trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/web.xml
trunk/samples/stdcomponents-sample/src/main/webapp/index.jsp
trunk/samples/stdcomponents-sample/src/main/webapp/pages/
trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.jsp
trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.xhtml
Modified:
trunk/samples/pom.xml
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
Log:
http://jira.jboss.com/jira/browse/RF-2138
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-02-29 18:42:06 UTC (rev 6463)
+++ trunk/samples/pom.xml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -463,7 +463,7 @@
<module>combobox-sample</module>
<module>pickList-sample</module>
<module>progressBarDemo</module>
- <module>jira-data</module>
-
+ <module>jira-data</module>
+ <module>stdcomponents-sample</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-02-29 18:42:06 UTC (rev 6463)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -47,6 +47,11 @@
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
<param-value>NEKO</param-value>
</context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>enable</param-value>
+ </context-param>
+
<!--context-param>
<param-name>org.richfaces.LoadStyleStrategy</param-name>
<param-value>DEFAULT</param-value>
Property changes on: trunk/samples/stdcomponents-sample
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.classpath
.project
Added: trunk/samples/stdcomponents-sample/pom.xml
===================================================================
--- trunk/samples/stdcomponents-sample/pom.xml (rev 0)
+++ trunk/samples/stdcomponents-sample/pom.xml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>stdcomponents-sample</artifactId>
+ <packaging>war</packaging>
+ <name>stdcomponents-sample Maven Webapp</name>
+ <build>
+ <finalName>stdcomponents-sample</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>stdcomponents-skinning</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>skins</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/samples/stdcomponents-sample/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/META-INF/MANIFEST.MF 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/faces-config.xml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>skinBean</managed-bean-name>
+ <managed-bean-class>org.richfaces.SkinBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/WEB-INF/web.xml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+ <context-param>
+ <param-name>org.ajax4jsf.SKIN</param-name>
+ <param-value>#{skinBean.skin}</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
+ <param-value>disable</param-value>
+ <!--param-value>disable</param-value-->
+ </context-param>
+
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>disable</param-value>
+ <!--param-value>disable</param-value-->
+ </context-param>
+
+ <!--
+ -->
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Added: trunk/samples/stdcomponents-sample/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/index.jsp (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/index.jsp 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,11 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+
+<head></head>
+
+ <body>
+ <jsp:forward page="/pages/index.jsf" />
+ </body>
+
+</html>
\ No newline at end of file
Added: trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.jsp (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.jsp 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,86 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:form>
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ </h:form>
+
+ <div class="rich-container">
+ <fieldset>
+ <legend>Inside rich-container</legend>
+ <button>Test</button>
+ <input type="Button" value="Test">
+ <input type="Checkbox">
+ <input type="File">
+ <input type="Radio">
+ <input type="Text" value="Test">
+ <select size="1">
+ <option>Test</option>
+ </select>
+
+ <select multiple>
+ <option>Test</option>
+ <option>Test1</option>
+ <option>Test2</option>
+ <option>Test3</option>
+ </select>
+
+
+ <br><br>
+ <textarea>text</textarea>
+
+ <keygen />
+ <br><br>
+ <isindex />
+
+ <a href="#1">Link 1</a>
+ <br />
+ <a href="#2">Link 2</a>
+
+ </fieldset>
+ </div>
+
+
+ <div>
+ <fieldset>
+ <legend>Without rich-container</legend>
+ <button>Test</button>
+ <input type="Button" value="Test">
+ <input type="Checkbox">
+ <input type="File">
+ <input type="Radio">
+ <input type="Text" value="Test">
+ <select size="1">
+ <option>Test</option>
+ </select>
+
+ <select multiple>
+ <option>Test</option>
+ <option>Test1</option>
+ <option>Test2</option>
+ <option>Test3</option>
+ </select>
+
+
+ <br><br>
+ <textarea>text</textarea>
+
+ <keygen />
+ <br><br>
+ <isindex />
+
+ <a href="#1">Link 1</a>
+ <br />
+ <a href="#2">Link 2</a>
+
+ </fieldset>
+ </div>
+ </f:view>
+ </body>
+</html>
Added: trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.xhtml (rev 0)
+++ trunk/samples/stdcomponents-sample/src/main/webapp/pages/index.xhtml 2008-02-29 18:44:21 UTC (rev 6464)
@@ -0,0 +1,12 @@
+<!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="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ >
+ <f:view>
+
+ </f:view>
+</html>
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r6463 - in trunk/ui: assembly and 10 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 13:42:06 -0500 (Fri, 29 Feb 2008)
New Revision: 6463
Added:
trunk/ui/stdcomponents-skinning/
trunk/ui/stdcomponents-skinning/pom.xml
trunk/ui/stdcomponents-skinning/src/
trunk/ui/stdcomponents-skinning/src/main/
trunk/ui/stdcomponents-skinning/src/main/resources/
trunk/ui/stdcomponents-skinning/src/main/resources/META-INF/
trunk/ui/stdcomponents-skinning/src/main/resources/META-INF/resources-config.xml
trunk/ui/stdcomponents-skinning/src/main/resources/org/
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-both.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-classes.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-styles.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-both.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-classes.xcss
trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-styles.xcss
Modified:
trunk/ui/assembly/pom.xml
trunk/ui/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-2138
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2008-02-29 18:33:34 UTC (rev 6462)
+++ trunk/ui/assembly/pom.xml 2008-02-29 18:42:06 UTC (rev 6463)
@@ -63,6 +63,7 @@
<!--
<templateXpath>/*[local-name()='template']/*</templateXpath>
-->
+ <excludeXcss>**/basic.xcss, **/basic_classes.xcss, **/extended.xcss, **/extended_classes.xcss, **/skin*.xcss</excludeXcss>
<commonStyle>org/richfaces/skin.xcss</commonStyle>
</configuration>
<executions>
@@ -320,4 +321,4 @@
</plugins>
</build>
<dependencies />
-</project>
\ No newline at end of file
+</project>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2008-02-29 18:33:34 UTC (rev 6462)
+++ trunk/ui/pom.xml 2008-02-29 18:42:06 UTC (rev 6463)
@@ -1,7 +1,5 @@
<?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">
+<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>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
@@ -107,7 +105,8 @@
<module>combobox</module>
<module>pickList</module>
<module>progressBAR</module>
- </modules>
+ <module>stdcomponents-skinning</module>
+ </modules>
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
Property changes on: trunk/ui/stdcomponents-skinning
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
.settings
Added: trunk/ui/stdcomponents-skinning/pom.xml
===================================================================
--- trunk/ui/stdcomponents-skinning/pom.xml (rev 0)
+++ trunk/ui/stdcomponents-skinning/pom.xml 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>stdcomponents-skinning</artifactId>
+ <name>stdcomponents-skinning</name>
+</project>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/META-INF/resources-config.xml
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/META-INF/resources-config.xml (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/META-INF/resources-config.xml 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource>
+ <name>org/richfaces/renderkit/html/css/basic.xcss</name>
+ <path>org/richfaces/renderkit/html/css/basic.xcss</path>
+ </resource>
+ <resource>
+ <name>org/richfaces/renderkit/html/css/basic_classes.xcss</name>
+ <path>org/richfaces/renderkit/html/css/basic_classes.xcss</path>
+ </resource>
+ <resource>
+ <name>org/richfaces/renderkit/html/css/extended.xcss</name>
+ <path>org/richfaces/renderkit/html/css/extended.xcss</path>
+ </resource>
+ <resource>
+ <name>org/richfaces/renderkit/html/css/extended_classes.xcss</name>
+ <path>org/richfaces/renderkit/html/css/extended_classes.xcss</path>
+ </resource>
+</resource-config>
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:selector name="input, select, textarea, button, keygen, isindex, legend">
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ </u:selector>
+
+ <f:verbatim>
+ <![CDATA[
+ fieldset {
+ border-width: 1px;
+ border-style: solid;
+ padding: 10px;
+ }
+
+ hr {
+ border-width: 1px;
+ border-style: solid;
+ }
+ ]]>
+ </f:verbatim>
+
+ <u:selector name="fieldset">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name="hr">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name="a">
+ <u:style name="color" skin="LinkColor" />
+ </u:selector>
+
+ <u:selector name="a:hover">
+ <u:style name="color" skin="hoverLinkColor" />
+ </u:selector>
+
+ <u:selector name="a:visited">
+ <u:style name="color" skin="visitedLinkColor" />
+ </u:selector>
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+
+ <u:selector name=".rich-container input, .rich-input
+ .rich-container select, .rich-select,
+ .rich-container textarea, .rich-textarea,
+ .rich-container button, .rich-button,
+ .rich-container keygen, .rich-keygen,
+ .rich-container isindex, .rich-isindex,
+ .rich-container legend, .rich-legend">
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ </u:selector>
+
+ <f:verbatim>
+ <![CDATA[
+ .rich-container fieldset, .rich-fieldset {
+ border-width: 1px;
+ border-style: solid;
+ padding: 10px;
+ }
+
+ .rich-container hr, .rich-hr {
+ border-width: 1px;
+ border-style: solid;
+ }
+ ]]>
+ </f:verbatim>
+
+ <u:selector name=".rich-container fieldset, .rich-fieldset">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-container hr, .rich-hr">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-container a">
+ <u:style name="color" skin="LinkColor" />
+ </u:selector>
+
+ <u:selector name=".rich-container a:hover">
+ <u:style name="color" skin="hoverLinkColor" />
+ </u:selector>
+
+ <u:selector name=".rich-container a:visited">
+ <u:style name="color" skin="visitedLinkColor" />
+ </u:selector>
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:selector name="input, select, textarea, button, keygen, isindex">
+ <u:style name="border-width" value="1px" />
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="color" skin="controlTextColor" />
+ </u:selector>
+
+ <f:verbatim>
+ <![CDATA[
+ *|button {
+ border-width: 1px;
+ background-repeat : repeat-x;
+ background-position : top left;
+ }
+
+ button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] {
+ border-width: 1px;
+ background-repeat : repeat-x;
+ background-position : top left;
+ }
+
+ ]]>
+ </f:verbatim>
+
+ <u:selector name="*|button">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="background-color" skin="headerBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+ <u:selector name="button[type="button"], button[type="reset"], button[type="submit"],
+ input[type="reset"], input[type="submit"], input[type="button"]">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="background-color" skin="headerBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+
+
+ <f:verbatim>
+ <![CDATA[
+ *|textarea {
+ border-width: 1px;
+ border-style : inset;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+ }
+
+ textarea[type="textarea"], input[type="text"], input[type="password"], select {
+ border-width: 1px;
+ border-style : inset;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+ }
+ ]]>
+ </f:verbatim>
+
+ <u:selector name="*|textarea">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ <u:style name="background-color" skin="controlBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+ <u:selector name="textarea[type="textarea"], input[type="text"], input[type="password"], select">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ <u:style name="background-color" skin="controlBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:selector name=".rich-container input,
+ .rich-container select,
+ .rich-container textarea,
+ .rich-container button,
+ .rich-container keygen,
+ .rich-container isindex">
+ <u:style name="border-width" value="1px" />
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="color" skin="controlTextColor" />
+ </u:selector>
+
+ <f:verbatim>
+ <![CDATA[
+ .rich-container *|button {
+ border-width: 1px;
+ background-repeat : repeat-x;
+ background-position : top left;
+ }
+
+ .rich-container button[type="button"],
+ .rich-container button[type="reset"],
+ .rich-container button[type="submit"],
+ .rich-container input[type="reset"],
+ .rich-container input[type="submit"],
+ .rich-container input[type="button"] {
+ border-width: 1px;
+ background-repeat : repeat-x;
+ background-position : top left;
+ }
+
+ ]]>
+ </f:verbatim>
+
+ <u:selector name=".rich-container *|button">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="background-color" skin="headerBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+ <u:selector name="
+ .rich-container button[type="button"],
+ .rich-container button[type="reset"],
+ .rich-container button[type="submit"],
+ .rich-container input[type="reset"],
+ .rich-container input[type="submit"],
+ .rich-container input[type="button"]
+ ">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="background-color" skin="headerBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+
+
+ <f:verbatim>
+ <![CDATA[
+ .rich-container *|textarea {
+ border-width: 1px;
+ border-style : inset;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+ }
+
+ .rich-container textarea[type="textarea"],
+ .rich-container input[type="text"],
+ .rich-container input[type="password"],
+ .rich-container select {
+ border-width: 1px;
+ border-style : inset;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+ }
+ ]]>
+ </f:verbatim>
+
+ <u:selector name=".rich-container *|textarea">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ <u:style name="background-color" skin="controlBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
+ </u:style>
+ </u:selector>
+
+ <u:selector name="
+ .rich-container textarea[type="textarea"],
+ .rich-container input[type="text"],
+ .rich-container input[type="password"],
+ .rich-container select">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="controlTextColor" />
+ <u:style name="background-color" skin="controlBackgroundColor" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/>
+ </u:style>
+ </u:selector>
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-both.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-both.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-both.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic.xcss" />
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" />
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-classes.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-classes.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-classes.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" />
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-styles.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-styles.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-bas-styles.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic.xcss" />
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-both.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-both.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-both.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic.xcss" />
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/extended.xcss" />
+ <u:insertResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" />
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-classes.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-classes.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-classes.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" />
+ <u:insertResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" />
+</f:template>
\ No newline at end of file
Added: trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-styles.xcss
===================================================================
--- trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-styles.xcss (rev 0)
+++ trunk/ui/stdcomponents-skinning/src/main/resources/org/richfaces/skin-ext-styles.xcss 2008-02-29 18:42:06 UTC (rev 6463)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:insertResource src="org/richfaces/skin.xcss" />
+
+ <u:insertResource src="org/richfaces/renderkit/html/css/basic.xcss" />
+ <u:insertResource src="org/richfaces/renderkit/html/css/extended.xcss" />
+</f:template>
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r6462 - trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-02-29 13:33:34 -0500 (Fri, 29 Feb 2008)
New Revision: 6462
Modified:
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java
Log:
excludeXcss parameter added to library assembly MOJO
Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2008-02-29 17:32:04 UTC (rev 6461)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2008-02-29 18:33:34 UTC (rev 6462)
@@ -54,12 +54,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.shared.io.scan.ResourceInclusionScanner;
-import org.apache.maven.shared.io.scan.SimpleResourceInclusionScanner;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.util.DirectoryScanner;
@@ -210,12 +205,18 @@
/**
* @parameter
*/
+ private String excludeXcss = null;
+
+ /**
+ * @parameter
+ */
private String commonStyle;
/**
* @parameter
*/
private String templateXpath;
+
/**
*
*/
@@ -239,15 +240,15 @@
mergeFacesConfig(models);
File resourcesConfig = new File(outputDirectory,
"META-INF/resources-config.xml");
- mergeXML(models, "META-INF/resources-config.xml",
+ mergeXML(models, "META-INF/resources-config.xml", null,
RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource",
"name/text()", new VelocityContext(), resourcesConfig, false);
if (null != commonStyle) {
File commonXcss = new File(outputDirectory, commonStyle);
- mergeXML(models, includeXcss, XCSS_TEMPLATE, templateXpath, null,
- new VelocityContext(), commonXcss, true);
+ mergeXML(models, includeXcss, excludeXcss, XCSS_TEMPLATE,
+ templateXpath, null, new VelocityContext(), commonXcss, true);
+ }
- }
if (null != library.getTaglibs() && library.getTaglibs().length > 0) {
for (int i = 0; i < library.getTaglibs().length; i++) {
Taglib taglib = library.getTaglibs()[i];
@@ -303,12 +304,12 @@
File tld = new File(outputDirectory, "META-INF/" + taglib.getTaglib()
+ ".tld");
getLog().debug("Write JSP taglib " + tld.getPath());
- mergeXML(models, includeTld, TLD_TEMPLATE, "/taglib/tag"
+ mergeXML(models, includeTld, null, TLD_TEMPLATE, "/taglib/tag"
+ createTagCondition(taglib, "name") + " | /taglib/listener",
null, new VelocityContext(taglibContext), tld, false);
File faceletsTaglib = new File(outputDirectory, "META-INF/"
+ taglib.getTaglib() + ".taglib.xml");
- mergeXML(models, includeTaglib, TAGLIB_TEMPLATE, "/facelet-taglib/tag"
+ mergeXML(models, includeTaglib, null, TAGLIB_TEMPLATE, "/facelet-taglib/tag"
+ createTagCondition(taglib, "tag-name")
+ " | /facelet-taglib/function", null, new VelocityContext(
taglibContext), faceletsTaglib, false);
@@ -597,22 +598,23 @@
* {@link Set} to check for duplicate keys. Must not be null
* @throws MojoExecutionException
*/
- private void mergeXML(List models, String filename, String templateName,
+ private void mergeXML(List models, String filename, String excludes, String templateName,
String commonXpath, String keyXPath, VelocityContext context,
File target, boolean namespaceAware) throws MojoExecutionException {
Set<String> keySet = new HashSet<String>();
StringBuffer content = new StringBuffer();
List<XMLBody> xmls = new ArrayList<XMLBody>(models.size());
String[] split = filename.split(",");
+ String[] excludesSplit = excludes != null ? excludes.split(",") : null;
for (Iterator iter = models.iterator(); iter.hasNext();) {
Model model = (Model) iter.next();
File moduleDir = new File(modulesDirectory, model.getArtifactId());
mergeXMLdir(moduleDir, commonXpath, keyXPath, namespaceAware,
- keySet, content, xmls, split);
+ keySet, content, xmls, split, excludesSplit);
}
if(null!=config){
mergeXMLdir(config, commonXpath, keyXPath, namespaceAware,
- keySet, content, xmls, split);
+ keySet, content, xmls, split, excludesSplit);
}
if (xmls.size() > 0) {
context.put("content", content.toString());
@@ -643,12 +645,13 @@
*/
private void mergeXMLdir(File moduleDir, String commonXpath,
String keyXPath, boolean namespaceAware, Set<String> keySet,
- StringBuffer content, List<XMLBody> xmls, String[] split)
+ StringBuffer content, List<XMLBody> xmls, String[] split, String[] excludesSplit)
throws IllegalStateException, MojoExecutionException {
DirectoryScanner ds = new DirectoryScanner();
ds.setFollowSymlinks(true);
ds.setBasedir(moduleDir);
ds.setIncludes(split);
+ ds.setExcludes(excludesSplit);
ds.addDefaultExcludes();
ds.scan();
String[] files = ds.getIncludedFiles();
16 years, 9 months
JBoss Rich Faces SVN: r6461 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits@lists.jboss.org
Author: ayanul
Date: 2008-02-29 12:32:04 -0500 (Fri, 29 Feb 2008)
New Revision: 6461
Added:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Options.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Style.xml
Log:
+update
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Options.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Options.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Options.xml 2008-02-29 17:32:04 UTC (rev 6461)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>option</managed-bean-name>
+ <managed-bean-class>rich.Options</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-SortingAndFiltering.xml 2008-02-29 17:32:04 UTC (rev 6461)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>sortingAndFiltering</managed-bean-name>
+ <managed-bean-class>sortingAndFiltering.SortingAndFiltering</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Style.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Style.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Style.xml 2008-02-29 17:32:04 UTC (rev 6461)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>style</managed-bean-name>
+ <managed-bean-class>util.style.Style</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>curentComponent</property-name>
+ <value>#{richBean}</value>
+ </managed-property>
+ </managed-bean>
+</faces-config>
16 years, 9 months
JBoss Rich Faces SVN: r6460 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2008-02-29 12:25:01 -0500 (Fri, 29 Feb 2008)
New Revision: 6460
Modified:
trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml
Log:
http://jira.jboss.com/jira/browse/RF-1216
Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2008-02-29 16:32:01 UTC (rev 6459)
+++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2008-02-29 17:25:01 UTC (rev 6460)
@@ -9,7 +9,7 @@
<title>Description</title>
<para>The <emphasis role="bold">
<property><rich:comboBox></property>
- </emphasis> is a component, that provides editable combo box element on the page.</para>
+ </emphasis> is a component, that provides editable combo box element on a page.</para>
<figure>
<title><emphasis role="bold"><property><rich:comboBox></property></emphasis> component</title>
<mediaobject>
Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-02-29 16:32:01 UTC (rev 6459)
+++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-02-29 17:25:01 UTC (rev 6460)
@@ -75,7 +75,7 @@
<itemizedlist>
<listitem>Default - only input and button is shown</listitem>
- <listitem>Input, button and popup list of suggestions attached to input is shown</listitem>
+ <listitem>Input, button and a popup list of suggestions attached to input is shown</listitem>
</itemizedlist>
</para>
<para>
@@ -115,8 +115,8 @@
The <emphasis><property> "value"</property></emphasis> attribute stores value from input after submit.
</para>
<para>
- The <emphasis><property> "directInputSuggestions"</property></emphasis> attribute defines, how the first value from the suggested appears in input field.
- If it's "true" the first value appears with untyped part highlighted.
+ The <emphasis><property> "directInputSuggestions"</property></emphasis> attribute defines, how the first value from the suggested one appears in an input field.
+ If it's "true" the first value appears with the suggested part highlighted.
</para>
<figure>
@@ -134,8 +134,8 @@
</para>
<para>
- The <emphasis><property> "selectFirstOnUpdate"</property></emphasis> attribute defines if the first value from suggested is selected in popup list.
- If it's "false" nothing is selected in the list before user hovered some item via mouse. Also nothing could be selected after mouse out the list.
+ The <emphasis><property> "selectFirstOnUpdate"</property></emphasis> attribute defines if the first value from suggested is selected in a popup list.
+ If it's "false" nothing is selected in the list before a user hovers some item with the mouse. Also nothing could be selected after the mouse is out the list.
</para>
<figure>
<title><emphasis role="bold">
@@ -151,12 +151,12 @@
<para>
The <emphasis><property> "filterNewValues"</property></emphasis> attribute defines the appearance of values in the list.
- If it's "true" only the part of list, which satisfies the prefix entered, could appears in popup list.
- If it's "false" all values appear in the popup list. But the list could be scrolled to the first value that satisfies the prefix.
+ If it's "true" only the part of a list, which satisfies the prefix entered appears in a popup list.
+ If it's "false" all values appear in the popup list. But the list is scrolled to the first value that satisfies the prefix.
</para>
<para>
- The <emphasis role="bold"><property><rich:comboBox></property></emphasis> component provides to use sizes attributes:
+ The <emphasis role="bold"><property><rich:comboBox></property></emphasis> component allows to use sizes attributes:
<itemizedlist>
<listitem>
<emphasis><property> "listWidth"</property></emphasis> and <emphasis><property> "listHeight"</property></emphasis> attributes
16 years, 9 months
JBoss Rich Faces SVN: r6459 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: msorokin
Date: 2008-02-29 11:32:01 -0500 (Fri, 29 Feb 2008)
New Revision: 6459
Modified:
trunk/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml
Log:
Altered some text
http://jira.jboss.com/jira/browse/RF-2329
Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml 2008-02-29 15:18:50 UTC (rev 6458)
+++ trunk/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml 2008-02-29 16:32:01 UTC (rev 6459)
@@ -22,5 +22,12 @@
</section>
<section id="treeNodeKF">
<title>Key Features</title>
+
+ <itemizedlist>
+ <listitem>Possibility to assign different icon images for each node within a tree</listitem>
+ <listitem>Drag and Drop support</listitem>
+ <listitem>Look-and-Feel customization</listitem>
+
+ </itemizedlist>
</section>
</section>
\ No newline at end of file
16 years, 9 months