From richfaces-svn-commits at lists.jboss.org Fri May 1 08:14:26 2009 Content-Type: multipart/mixed; boundary="===============7722978306164720361==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13985 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory. Date: Fri, 01 May 2009 08:12:30 -0400 Message-ID: --===============7722978306164720361== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: atsebro Date: 2009-05-01 08:12:30 -0400 (Fri, 01 May 2009) New Revision: 13985 Added: trunk/docs/userguide/en/src/main/resources/images/progressBar_pc2.png Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml Log: RF-5953: how to change background image for Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2009-= 04-30 22:31:06 UTC (rev 13984) +++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2009-= 05-01 12:12:30 UTC (rev 13985) @@ -715,6 +715,25 @@ = = As it could be seen on the picture above, background color of th= e remained part of progress area was changed. + = + + In order to change background image for the <rich:progressBar> it is n= ecessary to create a CSS class with the same name as predefined one = + (see the tables above) an= d change background-image CSS property for it: = + + = + This is the result: +
+ Redefining background image for the <rich:progress= Bar> + + + + + +
= = Added: trunk/docs/userguide/en/src/main/resources/images/progressBar_pc2.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/prog= ressBar_pc2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============7722978306164720361==-- From richfaces-svn-commits at lists.jboss.org Fri May 1 18:30:57 2009 Content-Type: multipart/mixed; boundary="===============6347817002650975386==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13986 - in trunk: ui/beanValidator and 8 other directories. Date: Fri, 01 May 2009 18:29:01 -0400 Message-ID: --===============6347817002650975386== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-01 18:29:01 -0400 (Fri, 01 May 2009) New Revision: 13986 Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/CompositeC= olor.java trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidat= or.java trunk/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateVa= lidator.java trunk/ui/beanValidator/src/main/java/org/richfaces/validator/NullValidat= or.java trunk/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValid= ator.java trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidat= orTest.java trunk/ui/beanValidator/src/test/java/org/richfaces/validator/HibernateVa= lidatorTest.java trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidat= ionProvider.java trunk/ui/beanValidator/src/test/resources/ trunk/ui/beanValidator/src/test/resources/META-INF/ trunk/ui/beanValidator/src/test/resources/META-INF/services/ trunk/ui/beanValidator/src/test/resources/META-INF/services/javax.valida= tion.spi.ValidationProvider Removed: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidat= or.java trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidat= orTest.java Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBack= groundLeft.java trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoot= erBackground.java trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoot= erLeft.java trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHead= erBackground.java trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHead= erLeft.java trunk/ui/beanValidator/pom.xml trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIGraphVali= dator.java trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/AjaxValidatorH= andler.java trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidatorT= ag.java trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanVa= lidator.java Log: JSR-3903 BeanValidators support was added. Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Compos= iteColor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/Composite= Color.java (rev 0) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/Composite= Color.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,73 @@ +/** + * = + */ +package org.richfaces.theme.images; + +import java.awt.Color; + +/** + * @author asmirnov + * + */ +(a)SuppressWarnings("serial") +public class CompositeColor extends Color { + = + private double mix =3D 0.0f; + private Color shadowColor; + = + public CompositeColor(int base, int shadow) { + super(base); + = + this.shadowColor =3D new Color(shadow); + } + + /** + * @return the mix + */ + public double getMix() { + return mix; + } + + /** + * @param mix the mix to set + */ + public void setMix(double mix) { + this.mix =3D mix; + } + = + = + public Color getMixedColor(){ + return new Color(getRed(),getGreen(),getBlue(),getAlpha()); + } + = + protected int mix(int from, int to){ + return (int)((double)from*(1.0-mix)+(double)to*mix); + } + = + = + @Override + public int getRed() { + return mix(super.getRed(),shadowColor.getRed()); + } + = + @Override + public int getGreen() { + return mix(super.getGreen(),shadowColor.getGreen()); + } + = + @Override + public int getBlue() { + return mix(super.getBlue(),shadowColor.getBlue()); + } + + @Override + public int getAlpha() { + return mix(super.getAlpha(),shadowColor.getAlpha()); + } + = + @Override + public int getRGB() { + // TODO Auto-generated method stub + return super.getRGB(); + } +} Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme= /images/CompositeColor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Sha= dowBackgroundLeft.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBac= kgroundLeft.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBac= kgroundLeft.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -31,9 +31,9 @@ Dimension dimensions =3D getDimensions(null); if(null !=3D shadowData.getShadowColor()){ // g2d.setColor(new Color(shadowData.getShadowColor())); - GradientPaint gragient =3D new GradientPaint( 2.0f,0.0f, new Color(s= hadowData.getShadowColor()&0xffffff,true),(float) MARGIN*2, 0, new Color(s= hadowData.getShadowColor())); + GradientPaint gragient =3D new GradientPaint( 0.0f,0.0f, new Color(s= hadowData.getShadowColor()&0xffffff,true),(float) MARGIN*2, 0, new Color(s= hadowData.getShadowColor())); g2d.setPaint(gragient); - g2d.fillRect(2, 0, (int) (MARGIN*2.0), dimensions.height); + g2d.fillRect(0, 0, (int) (MARGIN*2.0), dimensions.height); } if(null !=3D shadowData.getBorderColor()){ g2d.setColor(new Color(shadowData.getBorderColor())); Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Sha= dowFooterBackground.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoo= terBackground.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoo= terBackground.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -31,7 +31,7 @@ if(null !=3D shadowData.getShadowColor()){ g2d.setColor(new Color(shadowData.getShadowColor())); // g2d.fillRect(0, (int) (dim.height-MARGIN), dim.width, (int) MARGIN); - GradientPaint gragient =3D new GradientPaint(0.0f, (float) (dim.getH= eight()-2.0f), new Color(shadowData.getHeaderGradientColor()), 0.0f, (float= )(dim.getHeight()-MARGIN*2), new Color(shadowData.getShadowColor())); + GradientPaint gragient =3D new GradientPaint(0.0f, (float) dim.getHe= ight(), new Color(shadowData.getHeaderGradientColor()), 0.0f, (float)(dim.g= etHeight()-MARGIN*2), new Color(shadowData.getShadowColor())); g2d.setPaint(gragient); g2d.fillRect(0, (int) (dim.height-MARGIN), dim.width, (int) MARGIN); = } Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Sha= dowFooterLeft.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoo= terLeft.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFoo= terLeft.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -22,8 +22,15 @@ // Shadow ShadowData shadowData =3D (ShadowData) data; if(null !=3D shadowData.getShadowColor()){ - g2d.setColor(new Color(shadowData.getShadowColor())); - g2d.fillRoundRect(0, -dim.height, dim.width*2, dim.height*2,SHADOW_RADI= US,SHADOW_RADIUS); +// g2d.setColor(new Color(shadowData.getShadowColor())); +// g2d.fillRoundRect(0, -dim.height, dim.width*2, dim.height*2,SHADOW_RA= DIUS,SHADOW_RADIUS); + CompositeColor color =3D new CompositeColor(shadowData.getHeaderGradien= tColor(),shadowData.getShadowColor()); + for(int dx=3D0;dx < MARGIN;dx++){ + int radius =3D SHADOW_RADIUS+(int)MARGIN-dx; + color.setMix((double)dx/MARGIN/2.0); + g2d.setColor(color.getMixedColor()); + g2d.drawRoundRect(dx, -dx-dim.height-1, dim.width*2, dim.height*2,radi= us,radius); + } } g2d.translate(0.0, -MARGIN); RoundRectangle2D clip =3D new RoundRectangle2D.Double(MARGIN,-1.0*dim.ge= tHeight(),dim.getWidth()*2.0,dim.getHeight()*2.0,RADIUS,RADIUS); Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Sha= dowHeaderBackground.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHea= derBackground.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHea= derBackground.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -27,7 +27,7 @@ ShadowData shadowData =3D (ShadowData) data; if(null !=3D shadowData.getShadowColor()){ // g2d.setColor(new Color(shadowData.getHeaderGradientColor())); - GradientPaint gragient =3D new GradientPaint(0.0f, 2.0f, new Color(s= hadowData.getHeaderGradientColor()), 0, (float) MARGIN*2, new Color(shadowD= ata.getShadowColor())); + GradientPaint gragient =3D new GradientPaint(0.0f, 0.0f, new Color(s= hadowData.getHeaderGradientColor()), 0, (float) MARGIN*2, new Color(shadowD= ata.getShadowColor())); g2d.setPaint(gragient); g2d.fillRect(0, 0, getDimensions(null).width, (int) MARGIN); = } Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/Sha= dowHeaderLeft.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHea= derLeft.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHea= derLeft.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -22,8 +22,13 @@ Dimension dim =3D getDimensions(null, data); ShadowData shadowData =3D (ShadowData) data; if(null !=3D shadowData.getShadowColor()){ - g2d.setColor(new Color(shadowData.getShadowColor())); - g2d.fillRoundRect(0, 0, dim.width*2, dim.height*2,SHADOW_RADIUS,SHADOW_= RADIUS); + CompositeColor color =3D new CompositeColor(shadowData.getHeaderGradien= tColor(),shadowData.getShadowColor()); + for(int dx=3D0;dx < MARGIN;dx++){ + int radius =3D SHADOW_RADIUS+(int)MARGIN-dx; + color.setMix((double)dx/MARGIN/2.0); + g2d.setColor(color.getMixedColor()); + g2d.drawRoundRect(dx, dx, dim.width*2, dim.height*2,radius,radius); + } } // Paint gradient itself g2d.translate(0.0, MARGIN); Modified: trunk/ui/beanValidator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/pom.xml 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/pom.xml 2009-05-01 22:29:01 UTC (rev 13986) @@ -64,7 +64,13 @@ --> + true + + javax.validation + validation-api + 1.0.CR2 + org.slf4j slf4j-simple Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIGr= aphValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIGraphVal= idator.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIGraphVal= idator.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -51,7 +51,7 @@ import org.ajax4jsf.renderkit.AjaxContainerRenderer; import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.richfaces.event.ValidationEvent; -import org.richfaces.validator.BeanValidator; +import org.richfaces.validator.HibernateValidator; import org.richfaces.validator.FacesBeanValidator; import org.richfaces.validator.GraphValidator; = Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/AjaxVal= idatorHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/AjaxValidator= Handler.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/AjaxValidator= Handler.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -21,6 +21,7 @@ package org.richfaces.taglib; = import java.io.IOException; +import java.util.Set; = import javax.el.ELException; import javax.faces.FacesException; @@ -29,6 +30,7 @@ import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; = +import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.webapp.taglib.AjaxComponentHandler; import org.richfaces.component.UIBeanValidator; import org.richfaces.validator.FacesBeanValidator; @@ -61,6 +63,7 @@ = private TagAttribute _event; private TagAttribute _summary; + private TagAttribute _profiles; private AjaxComponentHandler _validatorHandler; = /** @@ -70,6 +73,7 @@ super(config); _event =3D getAttribute("event"); _summary =3D getAttribute("summary"); + _profiles =3D getAttribute("profiles"); _validatorHandler =3D new AjaxComponentHandler(config); } = @@ -93,8 +97,21 @@ .getApplication().createValidator( FacesBeanValidator.BEAN_VALIDATOR_TYPE); if (null !=3D _summary) { - validator.setSummary(_summary.getValueExpression(ctx, String.class)); + if (_summary.isLiteral()) { + validator.setSummary(_summary.getValue(ctx)); + + } else { + validator.setSummary(_summary.getValueExpression(ctx, + String.class)); + } } + if( null !=3D _profiles){ + if(_profiles.isLiteral()){ + validator.setProfiles(AjaxRendererUtils.asSet(_profiles.getValue())); + } else { + validator.setProfiles(_profiles.getValueExpression(ctx, Set.class)); + } + } ((EditableValueHolder) parent).addValidator(validator); } if (null !=3D this._event) { Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanVal= idatorTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidator= Tag.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/taglib/BeanValidator= Tag.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -27,7 +27,7 @@ import javax.faces.validator.Validator; import javax.servlet.jsp.JspException; = -import org.richfaces.validator.BeanValidator; +import org.richfaces.validator.HibernateValidator; import org.richfaces.validator.FacesBeanValidator; = public class BeanValidatorTag extends javax.faces.webapp.ValidatorELTag { @@ -45,7 +45,7 @@ = /** *

The {@link javax.el.ValueExpression} that evaluates to an object= that - * implements {@link BeanValidator}.

+ * implements {@link HibernateValidator}.

*/ private ValueExpression binding =3D null; = @@ -62,7 +62,7 @@ /** *

Set the expression that will be used to create a * {@link javax.el.ValueExpression} that references a backing bean pro= perty - * of the {@link BeanValidator} instance to be created.

+ * of the {@link HibernateValidator} instance to be created.

* * @param binding The new expression */ Deleted: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanV= alidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValida= tor.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValida= tor.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -1,578 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ -package org.richfaces.validator; - -import java.beans.FeatureDescriptor; -import java.util.Collection; -import java.util.EmptyStackException; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; -import java.util.Set; -import java.util.Stack; -import java.util.concurrent.ConcurrentHashMap; - -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.ValueExpression; -import javax.faces.FacesException; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.el.ELContextWrapper; -import org.hibernate.validator.ClassValidator; -import org.hibernate.validator.InvalidValue; - -/** - * Perform validation by Hibernate Validator annotations - * = - * @author asmirnov - * = - */ -public class BeanValidator { - - private static final String RESOURCE_BUNDLE_IS_NOT_REGISTERED_FOR_CURRENT= _LOCALE =3D "Resource bundle is not registered for current locale"; - - private static final String FACES_CONTEXT_IS_NULL =3D "Faces context is n= ull"; - - private static final String INPUT_PARAMETERS_IS_NOT_CORRECT =3D "Input pa= rameters is not correct."; - - private static final String LOCALE_IS_NOT_SET =3D "Locale is not set"; - - private static final String VIEW_ROOT_IS_NOT_INITIALIZED =3D "ViewRoot is= not initialized"; - - public static final String VALIDATOR_PARAM =3D BeanValidator.class.getNam= e(); - - private Map> classValidato= rs =3D new ConcurrentHashMap= >(); - - private BeanValidator() { - // This is a "singleton"-like class. Only factory methods allowed. - } - - /** - * Create BeanValidator instance. For a Junit tests only. - * = - * @return - */ - static BeanValidator createInstance() { - // TODO - get instance class name from a "META-INF/service" - // If the Seam framework is active, use org.jboss.seam.core.Validators - // component should be used. - return new BeanValidator(); - } - - private static final Object MUTEX =3D new Object(); - - /** - * Return BeanValidator object from a ServletContext attribute. Create new - * instance if none is defined. - * = - * @param context - * @return - */ - public static BeanValidator getInstance(FacesContext context) { - ExternalContext externalContext =3D context.getExternalContext(); - externalContext.getContext(); - BeanValidator instance; - // TODO - use properly synchronization mutex ? - synchronized (MUTEX) { - Map applicationMap =3D externalContext - .getApplicationMap(); - instance =3D (BeanValidator) applicationMap.get(VALIDATOR_PARAM); - if (null =3D=3D instance) { - // Vaildator not initialized - create and store new instance. - instance =3D createInstance(); - applicationMap.put(VALIDATOR_PARAM, instance); - } - } - return instance; - } - - /** - * Perform Validation for a new value. - * = - * @param context - * current faces context. - * @param target - * {@link ValueExpression} for a value assignment. - * @param value - * new value for validation - * @return null if no validation errors. Array of the validation messages - * otherwise. - * @throws FacesException - * if locale or context not properly initialized - */ - public String[] validate(FacesContext context, ValueExpression target, - Object value) { - // TODO - check null parameters. - if (null =3D=3D context) { - throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT); - } - String[] validationMessages =3D null; - if (null !=3D target) { - ELContext elContext =3D context.getELContext(); - ValidationResolver validationResolver =3D createValidationResolver( - elContext.getELResolver(), calculateLocale(context)); - ELContextWrapper wrappedElContext =3D new ELContextWrapper(elContext, - validationResolver); - // TODO - handle ELExceptions ? - try { - target.setValue(wrappedElContext, value); - } catch (ELException e) { - throw new FacesException(e); - } - if (!validationResolver.isValid()) { - validationMessages =3D validationResolver.getValidationMessages(); - } - - } - return validationMessages; - } - - protected Locale calculateLocale(FacesContext context) { - if (null =3D=3D context.getViewRoot()) { - throw new FacesException(VIEW_ROOT_IS_NOT_INITIALIZED); - } else if (null =3D=3D context.getViewRoot().getLocale()) { - throw new FacesException(LOCALE_IS_NOT_SET); - } - Locale locale =3D context.getViewRoot().getLocale(); - return locale; - } - - // Method for checking input parameters for prevent NPE - private void checkInputParameters(FacesContext context, - ValueExpression target) { - if (null =3D=3D context || null =3D=3D target) { - throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT); - } - } - - /** - * Validate bean property for a new value. TODO - localization ? - * = - * @param base - * - bean - * @param property - * - bean property name. - * @param value - * new value. - * @return null for a valid value, array of the validation messages - * othervise. - */ - public String[] validate(Object base, String property, Object value, - Locale locale) { - InvalidValue[] invalidValues =3D validateBean(base, property, value, - locale); - if (null =3D=3D invalidValues) { - return null; - } else { - String[] result =3D new String[invalidValues.length]; - for (int i =3D 0; i < invalidValues.length; i++) { - InvalidValue invalidValue =3D invalidValues[i]; - result[i] =3D invalidValue.getMessage(); - } - return result; - } - } - - @SuppressWarnings("unchecked") - public String[] validateGraph(FacesContext context, Object value, - Set profiles) { - if (null =3D=3D context) { - throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT); - } - String validationMessages[] =3D null; - if (null !=3D value) { - ClassValidator validator =3D (ClassValidator) getValida= tor( - value.getClass(), calculateLocale(context)); - if (validator.hasValidationRules()) { - InvalidValue[] invalidValues =3D validator - .getInvalidValues(value); - if (null !=3D invalidValues && invalidValues.length > 0) { - validationMessages =3D new String[invalidValues.length]; - for (int i =3D 0; i < invalidValues.length; i++) { - InvalidValue invalidValue =3D invalidValues[i]; - validationMessages[i] =3D invalidValue.getMessage(); - } - } - } - - } - return validationMessages; - } - - /** - * Validate bean property of the base object aganist new value - * = - * @param base - * @param property - * @param value - * @return - */ - protected InvalidValue[] validateBean(Object base, String property, - Object value, Locale locale) { - Class beanClass =3D base.getClass(); - InvalidValue[] invalidValues =3D validateClass(beanClass, property, - value, locale); - return invalidValues; - } - - /** - * Validate bean property in the base class aganist new value. - * = - * @param beanClass - * @param property - * @param value - * @return - */ - protected InvalidValue[] validateClass(Class beanClass, - String property, Object value, Locale locale) { - ClassValidator classValidator =3D getValidator( - beanClass, locale); - InvalidValue[] invalidValues =3D classValidator - .getPotentialInvalidValues(property, value); - return invalidValues; - } - - /** - * Get ( or create ) {@link ClassValidator} for a given bean class. - * = - * @param beanClass - * @return - */ - @SuppressWarnings("unchecked") - protected ClassValidator getValidator( - Class beanClass, Locale locale) { - // TODO - localization support. - ValidatorKey key =3D new ValidatorKey(beanClass, locale); - ClassValidator result =3D classValidators.get(key); - if (null =3D=3D result) { - result =3D createValidator(beanClass, locale); - classValidators.put(key, result); - } - return result; - } - - /* - * This method determine ResourceBundle, used in current request @param - * locale - user locale @return ResourceBundle instance - */ - protected ResourceBundle getCurrentResourceBundle(Locale locale) { - if (null =3D=3D FacesContext.getCurrentInstance() - || null =3D=3D FacesContext.getCurrentInstance().getApplication()) { - throw new FacesException(FACES_CONTEXT_IS_NULL); - } - String appBundle =3D FacesContext.getCurrentInstance().getApplication() - .getMessageBundle(); - if (null =3D=3D appBundle || null =3D=3D locale) { - return null; - } - - ResourceBundle bundle; - - ClassLoader classLoader =3D Thread.currentThread() - .getContextClassLoader(); - if (classLoader !=3D null) { - bundle =3D ResourceBundle.getBundle(appBundle, locale, classLoader); - } else { - bundle =3D ResourceBundle.getBundle(appBundle, locale); - } - - return bundle; - } - - /* - * Method for create new instance of ClassValidator, if same not in cache. - * = - * @param beanClass - Class to validate @param locale - user Locale, used - * during validation process @return ClassValidator instance - */ - @SuppressWarnings("unchecked") - protected ClassValidator createValidator( - Class beanClass, Locale locale) { - ResourceBundle bundle =3D getCurrentResourceBundle(locale); - return bundle =3D=3D null ? new ClassValidator(beanClass) - : new ClassValidator(beanClass, bundle); - } - - = - protected ValidationResolver createValidationResolver(ELResolver parent, = Locale locale) { - return new ValidationResolver(parent,locale); - } - /** - * Wrapper class for a {@link ELResolver}. For a setValue method, perform - * validation instead of real assignment. - * = - * @author asmirnov - * = - */ - final class ValidationResolver extends ELResolver { - - /** - * Original resolver. - */ - private final ELResolver parent; - - private boolean valid =3D true; - - private String[] validationMessages =3D null; - - private Locale locale =3D null; - - private Stack valuesStack; - - /** - * @param parent - */ - public ValidationResolver(ELResolver parent, Locale locale) { - this.parent =3D parent; - this.locale =3D locale; - this.valuesStack =3D new Stack(); - } - - public boolean isValid() { - // TODO Auto-generated method stub - return valid; - } - - /** - * @param context - * @param base - * @return - * @see javax.el.ELResolver#getCommonPropertyType(javax.el.ELContext, - * java.lang.Object) - */ - public Class getCommonPropertyType(ELContext context, Object base) { - return parent.getCommonPropertyType(context, base); - } - - /** - * @param context - * @param base - * @return - * @see javax.el.ELResolver#getFeatureDescriptors(javax.el.ELContext, - * java.lang.Object) - */ - public Iterator getFeatureDescriptors( - ELContext context, Object base) { - return parent.getFeatureDescriptors(context, base); - } - - /** - * @param context - * @param base - * @param property - * @return - * @see javax.el.ELResolver#getType(javax.el.ELContext, - * java.lang.Object, java.lang.Object) - */ - public Class getType(ELContext context, Object base, Object property)= { - return parent.getType(context, base, property); - } - - /** - * @param context - * @param base - * @param property - * @return - * @see javax.el.ELResolver#getValue(javax.el.ELContext, - * java.lang.Object, java.lang.Object) - */ - public Object getValue(ELContext context, Object base, Object property) { - Object value =3D parent.getValue(context, base, property); - valuesStack.push(new BasePropertyPair(base, property)); - return value; - } - - /** - * @param context - * @param base - * @param property - * @return - * @see javax.el.ELResolver#isReadOnly(javax.el.ELContext, - * java.lang.Object, java.lang.Object) - */ - public boolean isReadOnly(ELContext context, Object base, - Object property) { - return parent.isReadOnly(context, base, property); - } - - /** - * @param context - * @param base - * @param property - * @param value - * @see javax.el.ELResolver#setValue(javax.el.ELContext, - * java.lang.Object, java.lang.Object, java.lang.Object) - */ - public void setValue(ELContext context, Object base, Object property, - Object value) { - if (null !=3D base && null !=3D property) { - context.setPropertyResolved(true); - // For Arrays, Collection or Map use parent base and property. - BasePropertyPair basePropertyPair =3D lookupBeanProperty(new BasePrope= rtyPair( - base, property)); - base =3D basePropertyPair.getBase(); - property =3D basePropertyPair.getProperty(); - if (null !=3D base && null !=3D property) { - // https://jira.jboss.org/jira/browse/RF-4034 - // apache el looses locale information during value - // resolution, - // so we use our own - validationMessages =3D validate(base, property.toString(), - value, locale); - valid =3D null =3D=3D validationMessages - || 0 =3D=3D validationMessages.length; - - } - } - } - - private BasePropertyPair lookupBeanProperty(BasePropertyPair pair) { - Object base =3D pair.getBase(); - if (null !=3D base - && (base instanceof Collection || base instanceof Map || base - .getClass().isArray())) { - try { - pair =3D lookupBeanProperty(valuesStack.pop()); - } catch (EmptyStackException e) { - // Do nothing, this is a first item. - } - } - return pair; - } - - /** - * @return the validationMessages - */ - public String[] getValidationMessages() { - return validationMessages; - } - - } - - /** - * @author asmirnov - * - */ - static class BasePropertyPair { - private final Object base; - private final Object property; - - /** - * @param base - * @param property - */ - public BasePropertyPair(Object base, Object property) { - this.base =3D base; - this.property =3D property; - } - - /** - * @return the base - */ - public Object getBase() { - return base; - } - - /** - * @return the property - */ - public Object getProperty() { - return property; - } - - } - - /** - * Class for identify validator instance by locale - * = - * @author amarkhel - * = - */ - static class ValidatorKey { - private final Class validatableClass; - private final Locale locale; - - /** - * Constructor for ValidatorKey object - * = - * @param validatableClass - * - class to validate - * @param locale - * - User locale to determine Resource bundle, used during - * validation process - */ - public ValidatorKey(Class validatableClass, - Locale locale) { - this.validatableClass =3D validatableClass; - this.locale =3D locale; - } - - /* - * (non-Javadoc) - * = - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime =3D 31; - int result =3D 1; - result =3D prime * result - + ((locale =3D=3D null) ? 0 : locale.hashCode()); - result =3D prime - * result - + ((validatableClass =3D=3D null) ? 0 : validatableClass - .hashCode()); - return result; - } - - /* - * (non-Javadoc) - * = - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this =3D=3D obj) - return true; - if (obj =3D=3D null) - return false; - if (!(obj instanceof ValidatorKey)) - return false; - ValidatorKey other =3D (ValidatorKey) obj; - if (locale =3D=3D null) { - if (other.locale !=3D null) - return false; - } else if (!locale.equals(other.locale)) - return false; - if (validatableClass =3D=3D null) { - if (other.validatableClass !=3D null) - return false; - } else if (!validatableClass.equals(other.validatableClass)) - return false; - return true; - } - - } -} Added: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanVal= idator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValida= tor.java (rev 0) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValida= tor.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,147 @@ +/** + * = + */ +package org.richfaces.validator; + +import java.util.Locale; +import java.util.Set; + +import javax.faces.FacesException; +import javax.faces.context.FacesContext; +import javax.validation.ConstraintViolation; +import javax.validation.MessageInterpolator; +import javax.validation.Validation; +import javax.validation.ValidationException; +import javax.validation.Validator; +import javax.validation.ValidatorContext; +import javax.validation.ValidatorFactory; + +/** + * @author asmirnov + * = + */ +public class BeanValidator extends ObjectValidator { + + private volatile ValidatorFactory validatorFactory =3D null; + + BeanValidator() { + // Enforce class to load + ValidatorFactory.class.getName(); + } + + /* + * (non-Javadoc) + * = + * @see org.richfaces.validator.ObjectValidator#validate(java.lang.Object, + * java.lang.String, java.lang.Object, java.util.Locale) + */ + @Override + protected String[] validate(Object base, String property, Object value, + Locale locale, Set profiles) { + return extractMessages(getValidator(locale).validateProperty(base, + property, getGroups(profiles))); + } + + /* + * (non-Javadoc) + * = + * @see + * org.richfaces.validator.ObjectValidator#validateGraph(javax.faces.cont= ext + * .FacesContext, java.lang.Object, java.util.Set) + */ + @Override + public String[] validateGraph(FacesContext context, Object value, + Set profiles) { + Class[] groups =3D getGroups(profiles); + Set> violations =3D getValidator( + calculateLocale(context)).validate(value, groups); + String[] messages =3D extractMessages(violations); + return messages; + } + + private Class[] getGroups(Set profiles) { + Class groups[] =3D null; + if (null !=3D profiles) { + groups =3D new Class[profiles.size()]; + int i =3D 0; + for (String group : profiles) { + try { + groups[i] =3D Class.forName(group, false, Thread + .currentThread().getContextClassLoader()); + } catch (ClassNotFoundException e) { + try { + groups[i] =3D Class.forName(group); + } catch (ClassNotFoundException e1) { + throw new FacesException( + "Bean validation group not found " + group, e1); + } + } + i++; + } + + } + return groups; + } + + private String[] extractMessages(Set> violati= ons) { + String[] messages =3D null; + if (null !=3D violations && violations.size() > 0) { + messages =3D new String[violations.size()]; + int i =3D 0; + for (ConstraintViolation constraintViolation : violations) { + messages[i++] =3D constraintViolation.getMessage(); + } + + } + return messages; + } + + protected Validator getValidator(Locale locale) { + validatorFactory =3D null; + if (null =3D=3D validatorFactory) { + synchronized (this) { + if (null =3D=3D validatorFactory) { + try { + validatorFactory =3D Validation + .buildDefaultValidatorFactory(); + } catch (ValidationException e) { + throw new FacesException( + "Could not build a default Bean Validator factory", + e); + } + + } + } + } + + ValidatorContext validatorContext =3D validatorFactory.usingContext(); + MessageInterpolator jsfMessageInterpolator =3D new JsfMessageInterpolato= r( + locale, validatorFactory.getMessageInterpolator()); + validatorContext.messageInterpolator(jsfMessageInterpolator); + Validator beanValidator =3D validatorContext.getValidator(); + return beanValidator; + } + + private static class JsfMessageInterpolator implements MessageInterpolato= r { + + private Locale locale; + private MessageInterpolator delegate; + + public JsfMessageInterpolator(Locale locale, + MessageInterpolator delegate) { + this.locale =3D locale; + this.delegate =3D delegate; + } + + public String interpolate(String messageTemplate, Context context) { + return delegate.interpolate(messageTemplate, context, this.locale); + } + + public String interpolate(String messageTemplate, Context context, + Locale locale) { + return delegate.interpolate(messageTemplate, context, locale); + } + + } + +} Property changes on: trunk/ui/beanValidator/src/main/java/org/richfaces/val= idator/BeanValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/Face= sBeanValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanV= alidator.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanV= alidator.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -48,18 +48,22 @@ private static final long serialVersionUID =3D -264568176252121853L; public static final String BEAN_VALIDATOR_TYPE =3D "org.richfaces.BeanVal= idator"; = - private ValueExpression summary =3D null; + private ValueExpression summaryExpression =3D null; = - private String summaryString =3D null; + private String summary =3D null; + = + private ValueExpression profilesExpression =3D null; + + private Set profiles =3D null; /** * @return the summary */ public String getSummary() { String summaryString =3D null; - if(null !=3D summary){ - summaryString =3D (String) summary.getValue(FacesContext.getCurrentIns= tance().getELContext()); + if(null !=3D summaryExpression){ + summaryString =3D (String) summaryExpression.getValue(FacesContext.get= CurrentInstance().getELContext()); }else { - summaryString =3D this.summaryString; + summaryString =3D this.summary; } return summaryString; } @@ -68,7 +72,7 @@ * @param summary the summary to set */ public void setSummary(ValueExpression summary) { - this.summary =3D summary; + this.summaryExpression =3D summary; } = = @@ -76,7 +80,7 @@ * @param summary the summary to set */ public void setSummary(String summary) { - this.summaryString =3D summary; + this.summary =3D summary; } /* * (non-Javadoc) @@ -94,8 +98,8 @@ .getValueExpression("value"); if (null !=3D valueExpression) { // TODO - check EL Exceptions ? - String[] messages =3D BeanValidator.getInstance(context) - .validate(context, valueExpression, convertedValue); + String[] messages =3D HibernateValidator.getInstance(context) + .validate(context, valueExpression, convertedValue, getProfiles()); if (null !=3D messages) { input.setValid(false); // send all validation messages. @@ -116,8 +120,33 @@ = public String[] validateGraph(FacesContext context, UIComponent component, Object value, Set profiles) throws ValidatorException { - BeanValidator beanValidator =3D BeanValidator.getInstance(context); + ObjectValidator beanValidator =3D HibernateValidator.getInstance(context= ); String[] messages =3D beanValidator.validateGraph(context, value,profile= s); return messages; } + + /** + * @return the profiles + */ + @SuppressWarnings("unchecked") + public Set getProfiles() { + Set profiles; + if(null !=3D profilesExpression){ + profiles =3D (Set) profilesExpression.getValue(FacesContext.ge= tCurrentInstance().getELContext()); + }else { + profiles =3D this.profiles; + } + return profiles; + } + + /** + * @param profiles the profiles to set + */ + public void setProfiles(Set profiles) { + this.profiles =3D profiles; + } + = + public void setProfiles(ValueExpression profilesExpression) { + this.profilesExpression =3D profilesExpression; + } } Copied: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/Hibern= ateValidator.java (from rev 13985, trunk/ui/beanValidator/src/main/java/org= /richfaces/validator/BeanValidator.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateV= alidator.java (rev 0) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateV= alidator.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,168 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ +package org.richfaces.validator; + +import java.beans.FeatureDescriptor; +import java.util.Collection; +import java.util.EmptyStackException; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.Stack; +import java.util.concurrent.ConcurrentHashMap; + +import javax.el.ELResolver; +import javax.faces.FacesException; +import javax.faces.context.FacesContext; + +import org.hibernate.validator.ClassValidator; +import org.hibernate.validator.InvalidValue; + +/** + * Perform validation by Hibernate Validator annotations + * = + * @author asmirnov + * = + */ +public class HibernateValidator extends ObjectValidator { + + private Map> classValidato= rs =3D new ConcurrentHashMap= >(); + + HibernateValidator() { + // This is a "singleton"-like class. Only factory methods allowed. + // Enforce class to load + ClassValidator.class.getName(); + } + + @Override + @SuppressWarnings("unchecked") + public String[] validateGraph(FacesContext context, Object value, + Set profiles) { + if (null =3D=3D context) { + throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT); + } + String validationMessages[] =3D null; + if (null !=3D value) { + ClassValidator validator =3D (ClassValidator) getValida= tor( + value.getClass(), calculateLocale(context)); + if (validator.hasValidationRules()) { + InvalidValue[] invalidValues =3D validator + .getInvalidValues(value); + if (null !=3D invalidValues && invalidValues.length > 0) { + validationMessages =3D new String[invalidValues.length]; + for (int i =3D 0; i < invalidValues.length; i++) { + InvalidValue invalidValue =3D invalidValues[i]; + validationMessages[i] =3D invalidValue.getMessage(); + } + } + } + + } + return validationMessages; + } + + /** + * Validate bean property in the base class aganist new value. + * = + * @param beanClass + * @param property + * @param value + * @return + */ + protected InvalidValue[] validateClass(Class beanClass, + String property, Object value, Locale locale) { + ClassValidator classValidator =3D getValidator( + beanClass, locale); + InvalidValue[] invalidValues =3D classValidator + .getPotentialInvalidValues(property, value); + return invalidValues; + } + + /** + * Get ( or create ) {@link ClassValidator} for a given bean class. + * = + * @param beanClass + * @return + */ + @SuppressWarnings("unchecked") + protected ClassValidator getValidator( + Class beanClass, Locale locale) { + // TODO - localization support. + ValidatorKey key =3D new ValidatorKey(beanClass, locale); + ClassValidator result =3D classValidators.get(key); + if (null =3D=3D result) { + result =3D createValidator(beanClass, locale); + classValidators.put(key, result); + } + return result; + } + + /* + * Method for create new instance of ClassValidator, if same not in cache. + * = + * @param beanClass - Class to validate @param locale - user Locale, used + * during validation process @return ClassValidator instance + */ + @SuppressWarnings("unchecked") + protected ClassValidator createValidator( + Class beanClass, Locale locale) { + ResourceBundle bundle =3D getCurrentResourceBundle(locale); + return bundle =3D=3D null ? new ClassValidator(beanClass) + : new ClassValidator(beanClass, bundle); + } + + @Override + protected String[] validate(Object base, String property, Object value, + Locale locale, Set profiles) { + InvalidValue[] invalidValues =3D validateBean(base, property, value, + locale); + if (null =3D=3D invalidValues) { + return null; + } else { + String[] result =3D new String[invalidValues.length]; + for (int i =3D 0; i < invalidValues.length; i++) { + InvalidValue invalidValue =3D invalidValues[i]; + result[i] =3D invalidValue.getMessage(); + } + return result; + } + } + + /** + * Validate bean property of the base object aganist new value + * = + * @param base + * @param property + * @param value + * @return + */ + protected InvalidValue[] validateBean(Object base, String property, Objec= t value, + Locale locale) { + Class beanClass =3D base.getClass(); + InvalidValue[] invalidValues =3D validateClass(beanClass, property, + value, locale); + return invalidValues; + } + + = +} Added: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/NullVal= idator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/NullValida= tor.java (rev 0) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/NullValida= tor.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,37 @@ +/** + * = + */ +package org.richfaces.validator; + +import java.util.Locale; +import java.util.Set; + +import javax.faces.context.FacesContext; + +/** + * @author asmirnov + * + */ +public class NullValidator extends ObjectValidator { + + /* (non-Javadoc) + * @see org.richfaces.validator.ObjectValidator#validate(java.lang.Object= , java.lang.String, java.lang.Object, java.util.Locale) + */ + @Override + protected String[] validate(Object base, String property, Object value, + Locale locale, Set profiles) { + // do nothing. + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.validator.ObjectValidator#validateGraph(javax.faces= .context.FacesContext, java.lang.Object, java.util.Set) + */ + @Override + public String[] validateGraph(FacesContext context, Object value, + Set profiles) { + // do nothing + return null; + } + +} Property changes on: trunk/ui/beanValidator/src/main/java/org/richfaces/val= idator/NullValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectV= alidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectVali= dator.java (rev 0) +++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectVali= dator.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,443 @@ +package org.richfaces.validator; + +import java.beans.FeatureDescriptor; +import java.util.Collection; +import java.util.EmptyStackException; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.Stack; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.ELResolver; +import javax.el.ValueExpression; +import javax.faces.FacesException; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.el.ELContextWrapper; + +public abstract class ObjectValidator { + + private static final String RESOURCE_BUNDLE_IS_NOT_REGISTERED_FOR_CURRENT= _LOCALE =3D "Resource bundle is not registered for current locale"; + + private static final String FACES_CONTEXT_IS_NULL =3D "Faces context is n= ull"; + protected static final String INPUT_PARAMETERS_IS_NOT_CORRECT =3D "Input = parameters is not correct."; + private static final String LOCALE_IS_NOT_SET =3D "Locale is not set"; + private static final String VIEW_ROOT_IS_NOT_INITIALIZED =3D "ViewRoot is= not initialized"; + public static final String VALIDATOR_PARAM =3D HibernateValidator.class + .getName(); + + private static final Object MUTEX =3D new Object(); + + /** + * Create BeanValidator instance. For a Junit tests only. + * = + * @return + */ + protected static ObjectValidator createInstance() { + // TODO - get instance class name from a "META-INF/service" + // If the Seam framework is active, org.jboss.seam.core.Validators + // component should be used. + ObjectValidator validator; + try { + validator =3D new BeanValidator(); + + } catch (NoClassDefFoundError e) { + try { + validator =3D new HibernateValidator(); + + } catch (NoClassDefFoundError e2) { + validator =3D new NullValidator(); + } + } + return validator; + } + + /** + * Return BeanValidator object from a ServletContext attribute. Create new + * instance if none is defined. + * = + * @param context + * @return + */ + public static ObjectValidator getInstance(FacesContext context) { + ExternalContext externalContext =3D context.getExternalContext(); + externalContext.getContext(); + ObjectValidator instance; + // TODO - use properly synchronization mutex ? + synchronized (MUTEX) { + Map applicationMap =3D externalContext + .getApplicationMap(); + instance =3D (ObjectValidator) applicationMap.get(VALIDATOR_PARAM); + if (null =3D=3D instance) { + // Vaildator not initialized - create and store new instance. + instance =3D createInstance(); + applicationMap.put(VALIDATOR_PARAM, instance); + } + } + return instance; + } + + public abstract String[] validateGraph(FacesContext context, Object value, + Set profiles); + + /** + * Perform Validation for a new value. + * = + * @param context + * current faces context. + * @param target + * {@link ValueExpression} for a value assignment. + * @param value + * new value for validation + * @param profiles TODO + * @return null if no validation errors. Array of the validation messages + * otherwise. + * @throws FacesException + * if locale or context not properly initialized + */ + public String[] validate(FacesContext context, ValueExpression target, + Object value, Set profiles) { + if (null =3D=3D context) { + throw new FacesException(INPUT_PARAMETERS_IS_NOT_CORRECT); + } + String[] validationMessages =3D null; + if (null !=3D target) { + ELContext elContext =3D context.getELContext(); + ValidationResolver validationResolver =3D createValidationResolver( + elContext.getELResolver(), calculateLocale(context),profiles); + ELContextWrapper wrappedElContext =3D new ELContextWrapper(elContext, + validationResolver); + // TODO - handle ELExceptions ? + try { + target.setValue(wrappedElContext, value); + } catch (ELException e) { + throw new FacesException(e); + } + if (!validationResolver.isValid()) { + validationMessages =3D validationResolver.getValidationMessages(); + } + + } + return validationMessages; + } + + protected Locale calculateLocale(FacesContext context) { + if (null =3D=3D context.getViewRoot()) { + throw new FacesException(VIEW_ROOT_IS_NOT_INITIALIZED); + } else if (null =3D=3D context.getViewRoot().getLocale()) { + throw new FacesException(LOCALE_IS_NOT_SET); + } + Locale locale =3D context.getViewRoot().getLocale(); + return locale; + } + + /** + * Validate bean property for a new value. + * = + * @param base + * - bean + * @param property + * - bean property name. + * @param value + * new value. + * @param profiles TODO + * @return null for a valid value, array of the validation messages + * othervise. + */ + protected abstract String[] validate(Object base, String property, + Object value, Locale locale, Set profiles); + + protected ResourceBundle getCurrentResourceBundle(Locale locale) { + if (null =3D=3D FacesContext.getCurrentInstance() + || null =3D=3D FacesContext.getCurrentInstance().getApplication()) { + throw new FacesException(FACES_CONTEXT_IS_NULL); + } + String appBundle =3D FacesContext.getCurrentInstance().getApplication() + .getMessageBundle(); + if (null =3D=3D appBundle || null =3D=3D locale) { + return null; + } + + ResourceBundle bundle; + + ClassLoader classLoader =3D Thread.currentThread() + .getContextClassLoader(); + if (classLoader !=3D null) { + bundle =3D ResourceBundle.getBundle(appBundle, locale, classLoader); + } else { + bundle =3D ResourceBundle.getBundle(appBundle, locale); + } + + return bundle; + } + + protected ValidationResolver createValidationResolver(ELResolver parent, + Locale locale, Set profiles) { + return new ValidationResolver(parent, locale, profiles); + } + + /** + * @author asmirnov + * = + */ + protected static class BasePropertyPair { + private final Object base; + private final Object property; + + /** + * @param base + * @param property + */ + public BasePropertyPair(Object base, Object property) { + this.base =3D base; + this.property =3D property; + } + + /** + * @return the base + */ + public Object getBase() { + return base; + } + + /** + * @return the property + */ + public Object getProperty() { + return property; + } + + } + + /** + * Class for identify validator instance by locale + * = + * @author amarkhel + * = + */ + protected static class ValidatorKey { + private final Class validatableClass; + private final Locale locale; + + /** + * Constructor for ValidatorKey object + * = + * @param validatableClass + * - class to validate + * @param locale + * - User locale to determine Resource bundle, used during + * validation process + */ + public ValidatorKey(Class validatableClass, + Locale locale) { + this.validatableClass =3D validatableClass; + this.locale =3D locale; + } + + /* + * (non-Javadoc) + * = + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime =3D 31; + int result =3D 1; + result =3D prime * result + + ((locale =3D=3D null) ? 0 : locale.hashCode()); + result =3D prime + * result + + ((validatableClass =3D=3D null) ? 0 : validatableClass + .hashCode()); + return result; + } + + /* + * (non-Javadoc) + * = + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this =3D=3D obj) + return true; + if (obj =3D=3D null) + return false; + if (!(obj instanceof ValidatorKey)) + return false; + ValidatorKey other =3D (ValidatorKey) obj; + if (locale =3D=3D null) { + if (other.locale !=3D null) + return false; + } else if (!locale.equals(other.locale)) + return false; + if (validatableClass =3D=3D null) { + if (other.validatableClass !=3D null) + return false; + } else if (!validatableClass.equals(other.validatableClass)) + return false; + return true; + } + + } + + /** + * Wrapper class for a {@link ELResolver}. For a setValue method, perform + * validation instead of real assignment. + * = + * @author asmirnov + * = + */ + final class ValidationResolver extends ELResolver { + + /** + * Original resolver. + */ + private final ELResolver parent; + + private boolean valid =3D true; + + private String[] validationMessages =3D null; + + private Locale locale =3D null; + + private Stack valuesStack; + + private Set profiles; + + /** + * @param parent + */ + public ValidationResolver(ELResolver parent, Locale locale,Set p= rofiles) { + this.parent =3D parent; + this.locale =3D locale; + this.valuesStack =3D new Stack(); + this.profiles =3D profiles; + } + + public boolean isValid() { + return valid; + } + + /** + * @param context + * @param base + * @return + * @see javax.el.ELResolver#getCommonPropertyType(javax.el.ELContext, + * java.lang.Object) + */ + public Class getCommonPropertyType(ELContext context, Object base) { + return parent.getCommonPropertyType(context, base); + } + + /** + * @param context + * @param base + * @return + * @see javax.el.ELResolver#getFeatureDescriptors(javax.el.ELContext, + * java.lang.Object) + */ + public Iterator getFeatureDescriptors( + ELContext context, Object base) { + return parent.getFeatureDescriptors(context, base); + } + + /** + * @param context + * @param base + * @param property + * @return + * @see javax.el.ELResolver#getType(javax.el.ELContext, + * java.lang.Object, java.lang.Object) + */ + public Class getType(ELContext context, Object base, Object property)= { + return parent.getType(context, base, property); + } + + /** + * @param context + * @param base + * @param property + * @return + * @see javax.el.ELResolver#getValue(javax.el.ELContext, + * java.lang.Object, java.lang.Object) + */ + public Object getValue(ELContext context, Object base, Object property) { + Object value =3D parent.getValue(context, base, property); + valuesStack.push(new BasePropertyPair(base, property)); + return value; + } + + /** + * @param context + * @param base + * @param property + * @return + * @see javax.el.ELResolver#isReadOnly(javax.el.ELContext, + * java.lang.Object, java.lang.Object) + */ + public boolean isReadOnly(ELContext context, Object base, + Object property) { + return parent.isReadOnly(context, base, property); + } + + /** + * @param context + * @param base + * @param property + * @param value + * @see javax.el.ELResolver#setValue(javax.el.ELContext, + * java.lang.Object, java.lang.Object, java.lang.Object) + */ + public void setValue(ELContext context, Object base, Object property, + Object value) { + if (null !=3D base && null !=3D property) { + context.setPropertyResolved(true); + // For Arrays, Collection or Map use parent base and property. + BasePropertyPair basePropertyPair =3D lookupBeanProperty(new BasePrope= rtyPair( + base, property)); + base =3D basePropertyPair.getBase(); + property =3D basePropertyPair.getProperty(); + if (null !=3D base && null !=3D property) { + // https://jira.jboss.org/jira/browse/RF-4034 + // apache el looses locale information during value + // resolution, + // so we use our own + validationMessages =3D validate(base, property.toString(), + value, locale, profiles); + valid =3D null =3D=3D validationMessages + || 0 =3D=3D validationMessages.length; + + } + } + } + + private BasePropertyPair lookupBeanProperty(BasePropertyPair pair) { + Object base =3D pair.getBase(); + if (null !=3D base + && (base instanceof Collection || base instanceof Map || base + .getClass().isArray())) { + try { + pair =3D lookupBeanProperty(valuesStack.pop()); + } catch (EmptyStackException e) { + // Do nothing, this is a first item. + } + } + return pair; + } + + /** + * @return the validationMessages + */ + public String[] getValidationMessages() { + return validationMessages; + } + + } + +} \ No newline at end of file Property changes on: trunk/ui/beanValidator/src/main/java/org/richfaces/val= idator/ObjectValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanV= alidatorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValida= torTest.java 2009-05-01 12:12:30 UTC (rev 13985) +++ trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValida= torTest.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -1,132 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ -package org.richfaces.validator; - -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - -import org.ajax4jsf.el.ELContextWrapper; -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.hibernate.validator.ClassValidator; -import org.hibernate.validator.InvalidValue; -import org.richfaces.validator.BeanValidator.ValidationResolver; - -public class BeanValidatorTest extends AbstractAjax4JsfTestCase { - - public BeanValidatorTest(String name) { - super(name); - } - - public void testValidate() { - = - } - = - public void setUp() throws Exception { - super.setUp(); - } - - public void tearDown() throws Exception { - super.tearDown(); - } - = - public void testGetValidator() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - ClassValidator validator =3D beanValidator.getValidato= r(ValidableBean.class,Locale.ENGLISH); - assertNotNull(validator); - assertTrue(validator.hasValidationRules()); - validator =3D beanValidator.getValidator(String.class,Locale.getDefault(= )); - assertNotNull(validator); - assertFalse(validator.hasValidationRules()); - } - - public void testValidateClass() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - InvalidValue[] invalidValues =3D beanValidator.validateClass(ValidableBe= an.class, "integerProperty", new Integer(3),Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(0, invalidValues.length); - invalidValues =3D beanValidator.validateClass(ValidableBean.class, "inte= gerProperty", new Integer(-1),Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(1, invalidValues.length); - invalidValues =3D beanValidator.validateClass(UnValidableBean.class, "in= tegerProperty", new Integer(-1),Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(0, invalidValues.length); - invalidValues =3D beanValidator.validateClass(ValidableBean.class, "nonE= xistentProperty", new Integer(-1),Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(0, invalidValues.length); - - } - = - public void testValidateBean() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "integerProperty", new Integer(-1),Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(1, invalidValues.length); - } - = - public void testValidateArray() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "array", "",Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(2, invalidValues.length); - System.out.println(invalidValues[0].getMessage()); - System.out.println(invalidValues[1].getMessage()); - } - - public void testValidateList() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "list", "",Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(1, invalidValues.length); - System.out.println(invalidValues[0].getMessage()); - } - public void testValidateMap() throws Exception { - BeanValidator beanValidator =3D BeanValidator.createInstance(); - InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "map", "",Locale.getDefault()); - assertNotNull(invalidValues); - assertEquals(1, invalidValues.length); - System.out.println(invalidValues[0].getMessage()); - } - = - public void testValidationResolver() throws Exception { - ValidableBean bean =3D new ValidableBean(); - BeanValidator beanValidator =3D BeanValidator.createInstance(); - ValidationResolver validationResolver =3D beanValidator.createValidation= Resolver(facesContext.getELContext().getELResolver(), Locale.US); - Object list =3D validationResolver.getValue(elContext, bean, "list"); - assertNotNull(list); - assertTrue(list instanceof List); - validationResolver.setValue(elContext, list, new Integer(0), ""); - assertFalse(validationResolver.isValid()); - assertEquals(1, validationResolver.getValidationMessages().length); - } - public void testValidationResolverMap() throws Exception { - ValidableBean bean =3D new ValidableBean(); - BeanValidator beanValidator =3D BeanValidator.createInstance(); - ValidationResolver validationResolver =3D beanValidator.createValidation= Resolver(facesContext.getELContext().getELResolver(), Locale.US); - Object list =3D validationResolver.getValue(elContext, bean, "map"); - assertNotNull(list); - assertTrue(list instanceof Map); - validationResolver.setValue(elContext, list, new Integer(0), ""); - assertFalse(validationResolver.isValid()); - assertEquals(1, validationResolver.getValidationMessages().length); - } -} Added: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanVal= idatorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValida= torTest.java (rev 0) +++ trunk/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValida= torTest.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,76 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ +package org.richfaces.validator; + +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; + +import javax.validation.constraints.NotNull; + +import org.ajax4jsf.el.ELContextWrapper; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.hibernate.validator.ClassValidator; +import org.hibernate.validator.InvalidValue; +import org.richfaces.validator.ObjectValidator.ValidationResolver; + +public class BeanValidatorTest extends AbstractAjax4JsfTestCase { + + public BeanValidatorTest(String name) { + super(name); + } + + = + public void setUp() throws Exception { + super.setUp(); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + = + public void testValidate() throws Exception { + BeanValidator validator =3D new BeanValidator(); + String[] validate =3D validator.validate(new Bean(), "property", null= , Locale.ENGLISH, null); + assertNotNull(validate); + assertEquals(1, validate.length); + } + = + public static class Bean { + String property; + + /** + * @return the property + */ + public String getProperty() { + return property; + } + + /** + * @param property the property to set + */ + @NotNull + public void setProperty(String property) { + this.property =3D property; + } + } +} Copied: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/Hibern= ateValidatorTest.java (from rev 13985, trunk/ui/beanValidator/src/test/java= /org/richfaces/validator/BeanValidatorTest.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/java/org/richfaces/validator/HibernateV= alidatorTest.java (rev 0) +++ trunk/ui/beanValidator/src/test/java/org/richfaces/validator/HibernateV= alidatorTest.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,132 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ +package org.richfaces.validator; + +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; + +import org.ajax4jsf.el.ELContextWrapper; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.hibernate.validator.ClassValidator; +import org.hibernate.validator.InvalidValue; +import org.richfaces.validator.ObjectValidator.ValidationResolver; + +public class HibernateValidatorTest extends AbstractAjax4JsfTestCase { + + public HibernateValidatorTest(String name) { + super(name); + } + + public void testValidate() { + = + } + = + public void setUp() throws Exception { + super.setUp(); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + = + public void testGetValidator() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + ClassValidator validator =3D beanValidator.getValidato= r(ValidableBean.class,Locale.ENGLISH); + assertNotNull(validator); + assertTrue(validator.hasValidationRules()); + validator =3D beanValidator.getValidator(String.class,Locale.getDefault(= )); + assertNotNull(validator); + assertFalse(validator.hasValidationRules()); + } + + public void testValidateClass() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + InvalidValue[] invalidValues =3D beanValidator.validateClass(ValidableBe= an.class, "integerProperty", new Integer(3),Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(0, invalidValues.length); + invalidValues =3D beanValidator.validateClass(ValidableBean.class, "inte= gerProperty", new Integer(-1),Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(1, invalidValues.length); + invalidValues =3D beanValidator.validateClass(UnValidableBean.class, "in= tegerProperty", new Integer(-1),Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(0, invalidValues.length); + invalidValues =3D beanValidator.validateClass(ValidableBean.class, "nonE= xistentProperty", new Integer(-1),Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(0, invalidValues.length); + + } + = + public void testValidateBean() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "integerProperty", new Integer(-1),Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(1, invalidValues.length); + } + = + public void testValidateArray() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "array", "",Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(2, invalidValues.length); + System.out.println(invalidValues[0].getMessage()); + System.out.println(invalidValues[1].getMessage()); + } + + public void testValidateList() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "list", "",Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(1, invalidValues.length); + System.out.println(invalidValues[0].getMessage()); + } + public void testValidateMap() throws Exception { + HibernateValidator beanValidator =3D new HibernateValidator(); + InvalidValue[] invalidValues =3D beanValidator.validateBean(new Validabl= eBean(), "map", "",Locale.getDefault()); + assertNotNull(invalidValues); + assertEquals(1, invalidValues.length); + System.out.println(invalidValues[0].getMessage()); + } + = + public void testValidationResolver() throws Exception { + ValidableBean bean =3D new ValidableBean(); + HibernateValidator beanValidator =3D new HibernateValidator(); + ValidationResolver validationResolver =3D beanValidator.createValidation= Resolver(facesContext.getELContext().getELResolver(), Locale.US,null); + Object list =3D validationResolver.getValue(elContext, bean, "list"); + assertNotNull(list); + assertTrue(list instanceof List); + validationResolver.setValue(elContext, list, new Integer(0), ""); + assertFalse(validationResolver.isValid()); + assertEquals(1, validationResolver.getValidationMessages().length); + } + public void testValidationResolverMap() throws Exception { + ValidableBean bean =3D new ValidableBean(); + HibernateValidator beanValidator =3D new HibernateValidator(); + ValidationResolver validationResolver =3D beanValidator.createValidation= Resolver(facesContext.getELContext().getELResolver(), Locale.US,null); + Object list =3D validationResolver.getValue(elContext, bean, "map"); + assertNotNull(list); + assertTrue(list instanceof Map); + validationResolver.setValue(elContext, list, new Integer(0), ""); + assertFalse(validationResolver.isValid()); + assertEquals(1, validationResolver.getValidationMessages().length); + } +} Property changes on: trunk/ui/beanValidator/src/test/java/org/richfaces/val= idator/HibernateValidatorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockVal= idationProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValida= tionProvider.java (rev 0) +++ trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValida= tionProvider.java 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1,223 @@ +/** + * = + */ +package org.richfaces.validator; + +import java.io.InputStream; +import java.util.Collections; +import java.util.Set; + +import javax.validation.BeanDescriptor; +import javax.validation.Configuration; +import javax.validation.ConstraintDescriptor; +import javax.validation.ConstraintValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.MessageInterpolator; +import javax.validation.TraversableResolver; +import javax.validation.Validator; +import javax.validation.ValidatorContext; +import javax.validation.ValidatorFactory; +import javax.validation.spi.BootstrapState; +import javax.validation.spi.ConfigurationState; +import javax.validation.spi.ValidationProvider; + +/** + * @author asmirnov + * + */ +public class MockValidationProvider implements ValidationProvider { + = + public ConstraintViolation getDefaultConstraint(){ + return new ConstraintViolation(){ + + public ConstraintDescriptor getConstraintDescriptor() { + // TODO Auto-generated method stub + return null; + } + + public Object getInvalidValue() { + // TODO Auto-generated method stub + return null; + } + + public Object getLeafBean() { + // TODO Auto-generated method stub + return null; + } + + public String getMessage() { + // TODO Auto-generated method stub + return null; + } + + public String getMessageTemplate() { + // TODO Auto-generated method stub + return null; + } + + public String getPropertyPath() { + // TODO Auto-generated method stub + return null; + } + + public T getRootBean() { + // TODO Auto-generated method stub + return null; + } + + public Class getRootBeanClass() { + // TODO Auto-generated method stub + return null; + } + = + }; + } + + /* (non-Javadoc) + * @see javax.validation.spi.ValidationProvider#buildValidatorFactory(jav= ax.validation.spi.ConfigurationState) + */ + public ValidatorFactory buildValidatorFactory( + ConfigurationState configurationState) { + // TODO Auto-generated method stub + return new ValidatorFactory(){ + + public MessageInterpolator getMessageInterpolator() { + // TODO Auto-generated method stub + return null; + } + + public Validator getValidator() { + // TODO Auto-generated method stub + return null; + } + + public ValidatorContext usingContext() { + // TODO Auto-generated method stub + return new ValidatorContext(){ + + public Validator getValidator() { + // TODO Auto-generated method stub + return new Validator(){ + + public BeanDescriptor getConstraintsForClass( + Class clazz) { + // TODO Auto-generated method stub + return null; + } + + public Set> validate( + T object, Class... groups) { + // TODO Auto-generated method stub + ConstraintViolation constrain =3D getDefaultConstraint(); + return Collections.singleton(constrain); + } + + public Set> validateProperty( + T object, String propertyName, + Class... groups) { + ConstraintViolation constrain =3D getDefaultConstraint(); + return Collections.singleton(constrain); + } + + public Set> validateValue( + Class beanType, String propertyName, + Object value, Class... groups) { + ConstraintViolation constrain =3D getDefaultConstraint(); + return Collections.singleton(constrain); + } + = + }; + } + + public ValidatorContext messageInterpolator( + MessageInterpolator messageInterpolator) { + // TODO Auto-generated method stub + return this; + } + + public ValidatorContext traversableResolver( + TraversableResolver traversableResolver) { + // TODO Auto-generated method stub + return this; + } + = + }; + } + = + }; + } + + /* (non-Javadoc) + * @see javax.validation.spi.ValidationProvider#createGenericConfiguratio= n(javax.validation.spi.BootstrapState) + */ + public Configuration createGenericConfiguration(BootstrapState state) { + // TODO Auto-generated method stub + return new Configuration(){ + + public Configuration addMapping( + InputStream stream) { + // TODO Auto-generated method stub + return this; + } + + public Configuration addProperty( + String name, String value) { + // TODO Auto-generated method stub + return this; + } + + public ValidatorFactory buildValidatorFactory() { + // TODO Auto-generated method stub + return MockValidationProvider.this.buildValidatorFactory(null); + } + + public Configuration constraintValidatorFactory( + ConstraintValidatorFactory constraintValidatorFactory) { + // TODO Auto-generated method stub + return this; + } + + public MessageInterpolator getDefaultMessageInterpolator() { + // TODO Auto-generated method stub + return null; + } + + public Configuration ignoreXmlConfiguration() { + // TODO Auto-generated method stub + return this; + } + + public Configuration messageInterpolator( + MessageInterpolator interpolator) { + // TODO Auto-generated method stub + return this; + } + + public Configuration traversableResolver( + TraversableResolver resolver) { + // TODO Auto-generated method stub + return this; + } + = + }; + } + + /* (non-Javadoc) + * @see javax.validation.spi.ValidationProvider#createSpecializedConfigur= ation(javax.validation.spi.BootstrapState, java.lang.Class) + */ + public > T createSpecializedConfiguration( + BootstrapState state, Class configurationClass) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see javax.validation.spi.ValidationProvider#isSuitable(java.lang.Clas= s) + */ + public boolean isSuitable( + Class> configurationClass) { + // TODO Auto-generated method stub + return false; + } + +} Property changes on: trunk/ui/beanValidator/src/test/java/org/richfaces/val= idator/MockValidationProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ui/beanValidator/src/test/resources/META-INF/services/javax.va= lidation.spi.ValidationProvider =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/resources/META-INF/services/javax.valid= ation.spi.ValidationProvider (rev 0) +++ trunk/ui/beanValidator/src/test/resources/META-INF/services/javax.valid= ation.spi.ValidationProvider 2009-05-01 22:29:01 UTC (rev 13986) @@ -0,0 +1 @@ +org.richfaces.validator.MockValidationProvider \ No newline at end of file --===============6347817002650975386==-- From richfaces-svn-commits at lists.jboss.org Fri May 1 19:12:26 2009 Content-Type: multipart/mixed; boundary="===============8397194908770807840==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13987 - trunk/ui/core/src/main/java/org/ajax4jsf/component. Date: Fri, 01 May 2009 19:10:30 -0400 Message-ID: --===============8397194908770807840== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-01 19:10:30 -0400 (Fri, 01 May 2009) New Revision: 13987 Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java Log: https://jira.jboss.org/jira/browse/RF-6746 Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java 2009-= 05-01 22:29:01 UTC (rev 13986) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java 2009-= 05-01 23:10:30 UTC (rev 13987) @@ -21,6 +21,8 @@ = package org.ajax4jsf.component; = +import java.io.IOException; + import javax.el.ELContext; import javax.el.ELException; import javax.el.ValueExpression; @@ -206,6 +208,13 @@ restoreNavigation(context, holder); } = + @Override + public void encodeAll(FacesContext context) throws IOException { + // Fix for https://jira.jboss.org/jira/browse/RF-6746 + ViewIdHolder holder =3D setupNavigation(context); + super.encodeAll(context); + restoreNavigation(context, holder); + } /* * (non-Javadoc) * = --===============8397194908770807840==-- From richfaces-svn-commits at lists.jboss.org Fri May 1 20:16:16 2009 Content-Type: multipart/mixed; boundary="===============3004713856561471509==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13988 - in trunk: samples/layout-sample/src/main/webapp/pages and 4 other directories. Date: Fri, 01 May 2009 20:14:19 -0400 Message-ID: --===============3004713856561471509== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-01 20:14:19 -0400 (Fri, 01 May 2009) New Revision: 13988 Added: trunk/ui/layout/src/main/java/org/richfaces/taglib/ trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/Bean.java trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml trunk/ui/layout/src/main/config/component/page.xml trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx Log: https://jira.jboss.org/jira/browse/RF-6629 Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/B= ean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/src/main/java/org/richfaces/samples/Bean.ja= va 2009-05-01 23:10:30 UTC (rev 13987) +++ trunk/samples/layout-sample/src/main/java/org/richfaces/samples/Bean.ja= va 2009-05-02 00:14:19 UTC (rev 13988) @@ -22,6 +22,10 @@ = private String theme =3D "simple"; = + private String contentType =3D "text/html"; + = + private String encoding =3D "UTF-8"; + = private int width=3D960; = private int sidebarWidth=3D260; @@ -107,4 +111,32 @@ public List getLayoutValues(){ return layoutValues; } + + /** + * @return the contentType + */ + public String getContentType() { + return contentType; + } + + /** + * @param contentType the contentType to set + */ + public void setContentType(String contentType) { + this.contentType =3D contentType; + } + + /** + * @return the encoding + */ + public String getEncoding() { + return encoding; + } + + /** + * @param encoding the encoding to set + */ + public void setEncoding(String encoding) { + this.encoding =3D encoding; + } } Modified: trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/ui/layout/src/main/config/component/page.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/config/component/page.xml 2009-05-01 23:10:30 = UTC (rev 13987) +++ trunk/ui/layout/src/main/config/component/page.xml 2009-05-02 00:14:19 = UTC (rev 13988) @@ -38,11 +38,9 @@ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase - &ui_component_attributes; &html_universal_attributes; Added: trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java = (rev 0) +++ trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java = 2009-05-02 00:14:19 UTC (rev 13988) @@ -0,0 +1,56 @@ +/** + * = + */ +package org.richfaces.taglib; + +import javax.faces.component.UIComponent; +import javax.faces.component.UIViewRoot; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.tag.TagAttribute; +import com.sun.facelets.tag.jsf.ComponentConfig; +import com.sun.facelets.tag.jsf.ComponentHandler; +import com.sun.facelets.tag.jsf.ComponentSupport; +import com.sun.facelets.tag.jsf.core.ViewHandler; + +/** + * This handler does same work as Facelet's {@link ViewHandler} does to se= tup page encoding and content type. + * = + * @author asmirnov + * + */ +public class PageTagHandler extends ComponentHandler { + + private TagAttribute locale; + private TagAttribute contentType; + private TagAttribute encoding; + + public PageTagHandler(ComponentConfig config) { + super(config); + this.locale =3D this.getAttribute("locale"); + this.contentType =3D this.getAttribute("contentType"); + this.encoding =3D this.getAttribute("encoding"); + } + = + @Override + protected void onComponentPopulated(FaceletContext ctx, UIComponent c, + UIComponent parent) { + super.onComponentPopulated(ctx, c, parent); + UIViewRoot root =3D ComponentSupport.getViewRoot(ctx, parent); + if (root !=3D null) { + if (this.locale !=3D null) { + root.setLocale(ComponentSupport.getLocale(ctx, + this.locale)); + } + if (this.contentType !=3D null) { + String v =3D this.contentType.getValue(ctx); + ctx.getFacesContext().getExternalContext().getRequestMap()= .put("facelets.ContentType", v); + } + if (this.encoding !=3D null) { + String v =3D this.encoding.getValue(ctx); + ctx.getFacesContext().getExternalContext().getRequestMap()= .put("facelets.Encoding", v); + } + } + } + +} Property changes on: trunk/ui/layout/src/main/java/org/richfaces/taglib/Pag= eTagHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-05-= 01 23:10:30 UTC (rev 13987) +++ trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-05-= 02 00:14:19 UTC (rev 13988) @@ -40,7 +40,7 @@
-
+
--===============3004713856561471509==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 07:06:20 2009 Content-Type: multipart/mixed; boundary="===============7496936315333876611==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13989 - trunk/ui/beanValidator/src/test/java/org/richfaces/validator. Date: Sun, 03 May 2009 06:59:56 -0400 Message-ID: --===============7496936315333876611== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 06:59:52 -0400 (Sun, 03 May 2009) New Revision: 13989 Modified: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValidat= ionProvider.java Log: BeanValidator made compileable Modified: trunk/ui/beanValidator/src/test/java/org/richfaces/validator/Mock= ValidationProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValida= tionProvider.java 2009-05-02 00:14:19 UTC (rev 13988) +++ trunk/ui/beanValidator/src/test/java/org/richfaces/validator/MockValida= tionProvider.java 2009-05-03 10:59:52 UTC (rev 13989) @@ -152,7 +152,7 @@ */ public Configuration createGenericConfiguration(BootstrapState state) { // TODO Auto-generated method stub - return new Configuration(){ + return new Configuration(){ = public Configuration addMapping( InputStream stream) { --===============7496936315333876611==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 07:54:07 2009 Content-Type: multipart/mixed; boundary="===============5583112106594887250==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13990 - trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images. Date: Sun, 03 May 2009 07:51:45 -0400 Message-ID: --===============5583112106594887250== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 07:51:44 -0400 (Sun, 03 May 2009) New Revision: 13990 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/B= aseControlBackgroundImage.java Log: BaseControlBackgroundImage fixed Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/i= mages/BaseControlBackgroundImage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/= BaseControlBackgroundImage.java 2009-05-03 10:59:52 UTC (rev 13989) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/= BaseControlBackgroundImage.java 2009-05-03 11:51:44 UTC (rev 13990) @@ -25,6 +25,7 @@ = import javax.faces.context.FacesContext; = +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlDimensions; import org.ajax4jsf.util.Zipper2; import org.richfaces.renderkit.html.BaseGradient; @@ -48,12 +49,22 @@ = public Dimension getDimensions(FacesContext facesContext, Object data)= { Data data2 =3D (Data) data; - if (data !=3D null) { + if (data !=3D null) { return new Dimension(super.getDimensions(facesContext, data).w= idth, data2.getHeight()); } else { return DIMENSION; } } + = + @Override + protected Dimension getDimensions(ResourceContext resourceContext) { + Data data =3D (Data) restoreData(resourceContext); + if (data !=3D null) { + return new Dimension(super.getDimensions(resourceContext).widt= h, data.getHeight()); + } else { + return DIMENSION; + } + } = protected final Integer getHeight(FacesContext context, String heightP= aramName) { SkinFactory skinFactory =3D SkinFactory.getInstance(); --===============5583112106594887250==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 08:38:58 2009 Content-Type: multipart/mixed; boundary="===============9014530164317657488==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13991 - in trunk/samples/richfaces-demo/src/main: flash and 6 other directories. Date: Sun, 03 May 2009 08:36:41 -0400 Message-ID: --===============9014530164317657488== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 08:36:41 -0400 (Sun, 03 May 2009) New Revision: 13991 Added: trunk/samples/richfaces-demo/src/main/flash/ trunk/samples/richfaces-demo/src/main/flash/text.sc trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/media= output/ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/media= output/text.swf trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examp= les/flashSampleDynamic.xhtml Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Medi= aBean.java trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/commo= n/components.properties trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examp= les/jpegSample.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage= .xhtml Log: SWF Example Added: trunk/samples/richfaces-demo/src/main/flash/text.sc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/flash/text.sc = (rev 0) +++ trunk/samples/richfaces-demo/src/main/flash/text.sc 2009-05-03 12:36:41= UTC (rev 13991) @@ -0,0 +1,14 @@ +#compile using http://www.swftools.org/ + +.flash filename=3D"text.swf" +.font times "Times.swf" +.text richfaces text=3D"RichFaces" font=3Dtimes size=3D200% color=3Dblue +.text mediaoutput text=3D"mediaOutput" font=3Dtimes size=3D100% color=3Dred + +.frame 1 + .put richfaces pin=3Dcenter x=3D50 y=3D50 = + .put mediaoutput pin=3Dcenter x=3D50 y=3D50 alpha=3D25% +.frame 200 + .change richfaces rotate+=3D360 pin=3Dcenter alpha=3D25% = + .change mediaoutput rotate-=3D360 pin=3Dcenter alpha=3D100% = +.end \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/med= ia/MediaBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Med= iaBean.java 2009-05-03 11:51:44 UTC (rev 13990) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Med= iaBean.java 2009-05-03 12:36:41 UTC (rev 13991) @@ -3,26 +3,54 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; + import javax.imageio.ImageIO; = public class MediaBean { = public void paint(OutputStream out, Object data) throws IOException{ if (data instanceof MediaData) { - = - MediaData paintData =3D (MediaData) data; - BufferedImage img =3D new BufferedImage(paintData.getWidth(),paintData.g= etHeight(),BufferedImage.TYPE_INT_RGB); - Graphics2D graphics2D =3D img.createGraphics(); - graphics2D.setBackground(paintData.getBackground()); - graphics2D.setColor(paintData.getDrawColor()); - graphics2D.clearRect(0,0,paintData.getWidth(),paintData.getHeight()); - graphics2D.drawLine(5,5,paintData.getWidth()-5,paintData.getHeight()-5); - graphics2D.drawChars(new String("RichFaces").toCharArray(),0,9,40,15); - graphics2D.drawChars(new String("mediaOutput").toCharArray(),0,11,5,45); + + MediaData paintData =3D (MediaData) data; + BufferedImage img =3D new BufferedImage(paintData.getWidth(),paintData.= getHeight(),BufferedImage.TYPE_INT_RGB); + Graphics2D graphics2D =3D img.createGraphics(); + graphics2D.setBackground(paintData.getBackground()); + graphics2D.setColor(paintData.getDrawColor()); + graphics2D.clearRect(0,0,paintData.getWidth(),paintData.getHeight()); + graphics2D.drawLine(5,5,paintData.getWidth()-5,paintData.getHeight()-5); + graphics2D.drawChars(new String("RichFaces").toCharArray(),0,9,40,15); + graphics2D.drawChars(new String("mediaOutput").toCharArray(),0,11,5,45); + + ImageIO.write(img,"jpeg",out); + + } + } + + private void copy(InputStream in, OutputStream out) throws IOException { + byte[] buffer =3D new byte[2048]; + int read; = - ImageIO.write(img,"jpeg",out); + while ((read =3D in.read(buffer)) !=3D -1) { + out.write(buffer, 0, read); + } + } + = + public void paintFlash(OutputStream out, Object data) throws IOException { + ClassLoader loader =3D Thread.currentThread().getContextClassLoader(); + if (loader =3D=3D null) { + loader =3D getClass().getClassLoader(); + } = + InputStream stream =3D loader.getResourceAsStream("org/richfaces/demo/me= diaoutput/text.swf"); + if (stream !=3D null) { + try { + copy(stream, out); + out.flush(); + } finally { + stream.close(); + } } } } \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/dem= o/common/components.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-03 11:51:44 UTC (rev 13990) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-03 12:36:41 UTC (rev 13991) @@ -60,7 +60,7 @@ loadStyle=3D ajaxResources, Style, /images/= ico_common.gif, /images/cn_Style.gif, lo= adStyle.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/loadStyle.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/taglib/ajax/LoadStyleTag.html, = /richfaces/style.jsf keepAlive=3D ajaxResources, Keep Alive, /images/= ico_common.gif, /images/cn_KeepAlive.gif, ke= epAlive.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/keepAlive.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.html, /richface= s/keepAlive.jsf include=3D ajaxOutput, Include, /images/= ico_common.gif, /images/cn_include2.gif, in= clude.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/include.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/ajax/UIInclude.html, /richface= s/include.jsf -mediaOutput=3D ajaxOutput, Media Output, /images/= ico_common.gif, /images/cn_MediaOutput.gif, me= diaOutput.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/mediaOutput.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html, /richface= s/mediaOutput.jsf +mediaOutput=3D ajaxOutput, Media Output, /images/= ico_common.gif, /images/cn_MediaOutput.gif, me= diaOutput.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/mediaOutput.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html, /richface= s/mediaOutput.jsf, new outputPanel=3D ajaxOutput, Output Panel, /images/= ico_common.gif, /images/cn_OutputPanel.gif, ou= tputPanel.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/outputPanel.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html, /richface= s/outputPanel.jsf repeat=3D richDataIterators, Repeat, /images/= ico_Repeat.gif, /images/cn_Repeat.gif, re= peat.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/repeat.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html, /richface= s/repeat.jsf htmlCommandLink=3D ajaxMisc, Html Command Link, /images/= ico_common.gif, /images/cn_HtmlCommandLink.gif, ht= mlCommandLink.html, jbossajax4jsf/freezo= ne/docs/tlddoc/a4j/htmlCommandLink.html, jbossajax4jsf/freezone/docs/a= pidoc/org/ajax4jsf/taglib/ajax/HtmlCommandLinkTag.html, /richfaces/htmlCo= mmandLink.jsf Added: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/m= ediaoutput/text.swf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/resources/org/ri= chfaces/demo/mediaoutput/text.swf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/e= xamples/flashSampleDynamic.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/flashSampleDynamic.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/flashSampleDynamic.xhtml 2009-05-03 12:36:41 UTC (rev 13991) @@ -0,0 +1,36 @@ + + + +

SWF Movie:

+ + + + + = + + + + + 3D"Get + + + + + + + +
+
+ + \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutpu= t/examples/jpegSample.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/jpegSample.xhtml 2009-05-03 11:51:44 UTC (rev 13990) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/jpegSample.xhtml 2009-05-03 12:36:41 UTC (rev 13991) @@ -6,7 +6,8 @@ xmlns:rich=3D"http://richfaces.org/rich"> = = -
+

Dynamically generated JPEG file:

+

Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutpu= t/usage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usag= e.xhtml 2009-05-03 11:51:44 UTC (rev 13990) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usag= e.xhtml 2009-05-03 12:36:41 UTC (rev 13991) @@ -35,12 +35,20 @@
= + + + - + = + + + + + --===============9014530164317657488==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 10:06:05 2009 Content-Type: multipart/mixed; boundary="===============7778103326120057393==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13992 - trunk/framework/impl/src/main/javascript/ajaxjsf. Date: Sun, 03 May 2009 10:03:48 -0400 Message-ID: --===============7778103326120057393== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 10:03:47 -0400 (Sun, 03 May 2009) New Revision: 13992 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js Log: https://jira.jboss.org/jira/browse/RF-6993 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2009-05-03 = 12:36:41 UTC (rev 13991) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2009-05-03 = 14:03:47 UTC (rev 13992) @@ -121,6 +121,9 @@ // anyway as IE7 hardcodes it to MSXML3.0 causing version problems = // between different activex controls = //if(!window.XMLHttpRequest){ + + Sarissa.originalXMLHttpRequest =3D window.XMLHttpRequest; + = /** * Emulate XMLHttpRequest * @constructor --===============7778103326120057393==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 18:55:27 2009 Content-Type: multipart/mixed; boundary="===============5880980962117143005==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13993 - trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media. Date: Sun, 03 May 2009 18:53:05 -0400 Message-ID: --===============5880980962117143005== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 18:53:04 -0400 (Sun, 03 May 2009) New Revision: 13993 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Medi= aBean.java Log: Unnecessary flush() call removed Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/med= ia/MediaBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Med= iaBean.java 2009-05-03 14:03:47 UTC (rev 13992) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/Med= iaBean.java 2009-05-03 22:53:04 UTC (rev 13993) @@ -47,7 +47,6 @@ if (stream !=3D null) { try { copy(stream, out); - out.flush(); } finally { stream.close(); } --===============5880980962117143005==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 19:51:51 2009 Content-Type: multipart/mixed; boundary="===============3609553097107377077==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13994 - trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf2644. Date: Sun, 03 May 2009 19:49:26 -0400 Message-ID: --===============3609553097107377077== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 19:49:25 -0400 (Sun, 03 May 2009) New Revision: 13994 Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java/= org/richfaces/regressionarea/issues/rf2644/DataBean.java Log: regressionArea: RF2644 test case updated Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/mai= n/java/org/richfaces/regressionarea/issues/rf2644/DataBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java= /org/richfaces/regressionarea/issues/rf2644/DataBean.java 2009-05-03 22:53:= 04 UTC (rev 13993) +++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/java= /org/richfaces/regressionarea/issues/rf2644/DataBean.java 2009-05-03 23:49:= 25 UTC (rev 13994) @@ -19,7 +19,7 @@ @Scope(ScopeType.SESSION) public class DataBean implements DataBeanLocal { = - @DataModel + @DataModel("rf2644Items") private List items =3D new ArrayList(); = @DataModelSelection --===============3609553097107377077==-- From richfaces-svn-commits at lists.jboss.org Sun May 3 21:12:55 2009 Content-Type: multipart/mixed; boundary="===============3062587211524077744==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13995 - trunk/framework/impl/src/main/java/org/ajax4jsf/application. Date: Sun, 03 May 2009 21:10:23 -0400 Message-ID: --===============3062587211524077744== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-03 21:10:22 -0400 (Sun, 03 May 2009) New Revision: 13995 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateMan= ager.java Log: https://jira.jboss.org/jira/browse/RF-6998 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxS= tateManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateMa= nager.java 2009-05-03 23:49:25 UTC (rev 13994) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateMa= nager.java 2009-05-04 01:10:22 UTC (rev 13995) @@ -326,7 +326,22 @@ return matcher.group(1); } = - private static final Object handleRestoreState(FacesContext context, Obje= ct state) { + private static final Map> PRIMITIVE_CLASSES =3D + new HashMap>(9, 1.0F); + + static { + PRIMITIVE_CLASSES.put("boolean", boolean.class); + PRIMITIVE_CLASSES.put("byte", byte.class); + PRIMITIVE_CLASSES.put("char", char.class); + PRIMITIVE_CLASSES.put("short", short.class); + PRIMITIVE_CLASSES.put("int", int.class); + PRIMITIVE_CLASSES.put("long", long.class); + PRIMITIVE_CLASSES.put("float", float.class); + PRIMITIVE_CLASSES.put("double", double.class); + PRIMITIVE_CLASSES.put("void", void.class); + } + = + private static final Object handleRestoreState(FacesContext context, O= bject state) { if (ContextInitParameters.isSerializeServerState(context)) { ObjectInputStream ois =3D null; try { @@ -334,8 +349,18 @@ @Override protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { - return Class.forName(desc.getName(), true, = - Thread.currentThread().getContextClassLoader()); + String name =3D desc.getName(); + try { + return Class.forName(name, true, = + Thread.currentThread().getContextClassLoader()); + } catch (ClassNotFoundException cnfe) { + Class clazz =3D PRIMITIVE_CLASSES.get(name); + if (clazz !=3D null) { + return clazz; + } else { + throw cnfe; + } + } } }; return ois.readObject(); --===============3062587211524077744==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 04:28:52 2009 Content-Type: multipart/mixed; boundary="===============2023166930887295015==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13996 - trunk/framework/impl/src/main/java/org/richfaces. Date: Mon, 04 May 2009 04:26:24 -0400 Message-ID: --===============2023166930887295015== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-04 04:26:24 -0400 (Mon, 04 May 2009) New Revision: 13996 Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java Log: change SVN revision and date Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-= 05-04 01:10:22 UTC (rev 13995) +++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-= 05-04 08:26:24 UTC (rev 13996) @@ -72,7 +72,7 @@ } = public String getRevision() { - return REVISION; = + return REVISION; } /* (non-Javadoc) * @see java.lang.Object#toString() --===============2023166930887295015==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 06:34:00 2009 Content-Type: multipart/mixed; boundary="===============0845509596812051572==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13997 - trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common. Date: Mon, 04 May 2009 06:31:29 -0400 Message-ID: --===============0845509596812051572== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-04 06:31:28 -0400 (Mon, 04 May 2009) New Revision: 13997 Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/commo= n/components.properties Log: https://jira.jboss.org/jira/browse/RF-6979 Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/dem= o/common/components.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-04 08:26:24 UTC (rev 13996) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-04 10:31:28 UTC (rev 13997) @@ -88,7 +88,7 @@ beanValidator=3DrichValidators, \t Bean Validator, \t\t/images/ico= _BeanValidator.gif, \t\t/images/cn_BeanValidator.gif, b= eanValidator.html, jbossrichfaces/free= zone/docs/tlddoc/rich/beanValidator.html, jbossrichfaces/freezone/docs= /apidoc/org/richfaces/component/UIBeanValidator.html, \t\t\t\t= \t/richfaces/beanValidator.jsf graphValidator=3DrichValidators, \t Graph Validator, \t\t/images/i= co_GraphValidator.gif, \t\t/images/cn_GraphValidator.gif, = graphValidator.html, jbossrichfaces= /freezone/docs/tlddoc/rich/graphValidator.html, jbossrichfaces/freezon= e/docs/apidoc/org/richfaces/component/UIGraphValidator.html, \= t\t\t\t\t/richfaces/graphValidator.jsf stateAPI=3DrichMisc, \t State Manager API, \t\t/images/ico_StateMa= nagerAPI.gif, \t\t/images/cn_StateManagerAPI.gif, Archi= tectureOverview.html\#statemanagerapi, = jbossrichfaces/freezone/docs/tlddoc/rich/graphValidator.html, jbossri= chfaces/freezone/docs/apidoc/org/richfaces/component/UIhotkey.html, = \t\t\t\t\t/richfaces/stateAPI.jsf -extendedDataTable=3D richDataIterators, Extended Data Table, = /images/ico_ExtendedDataTable.gif, /images/cn_ExtendedData= Table.gif, extendedDataTable.html, = jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, = jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataTa= ble.html, /richfaces/extendedDataTable.jsf +extendedDataTable=3D richDataIterators, Extended Data Table, = /images/ico_ExtendedDataTable.gif, /images/cn_ExtendedData= Table.gif, extendedDataTable.html, = jbossrichfaces/freezone/docs/tlddoc/rich/extendedDataTable.= html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/= UIExtendedDataTable.html, /richfaces/extendedDataTable.jsf editor=3DrichInputs, Editor, /images/ico_Editor.gif, = /images/cn_Editor.gif, editor.html, = jbossrichfaces/freezone/docs/tlddoc/rich/editor.html,= jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEdi= tor.html, /richfaces/editor.jsf queue=3DajaxSupport, Queue, /images/ico_common.gif, = /images/cn_Queue.gif, Queue.html, = jbossrichfaces/freezone/docs/tlddoc/rich/queue.html, = jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIQueue.h= tml, /richfaces/queue.jsf colorPicker=3D richInputs, Color Picker, /images/ico_ColorPic= ker.gif, /images/cn_ColorPicker.gif, ColorPicke= r.html, jbossrichfaces/freezone/do= cs/tlddoc/rich/colorPicker.html, jbossrichfaces/freezone/docs/apid= oc/org/richfaces/component/UIColorPicker.html, /richfaces/= colorPicker.jsf, new --===============0845509596812051572==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 07:00:05 2009 Content-Type: multipart/mixed; boundary="===============4480149537259283666==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13998 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples. Date: Mon, 04 May 2009 06:57:37 -0400 Message-ID: --===============4480149537259283666== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-04 06:57:37 -0400 (Mon, 04 May 2009) New Revision: 13998 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/example= s/editTable.xhtml Log: https://jira.jboss.org/jira/browse/RF-5468 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/= examples/editTable.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/exampl= es/editTable.xhtml 2009-05-04 10:31:28 UTC (rev 13997) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/exampl= es/editTable.xhtml 2009-05-04 10:57:37 UTC (rev 13998) @@ -53,7 +53,7 @@ Actions - - + --===============4480149537259283666==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 07:09:32 2009 Content-Type: multipart/mixed; boundary="===============8696210824840488780==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13999 - trunk/examples/photoalbum/source/web/src/main/webapp/includes/index. Date: Mon, 04 May 2009 07:07:03 -0400 Message-ID: --===============8696210824840488780== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-04 07:07:03 -0400 (Mon, 04 May 2009) New Revision: 13999 Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/stat= us.xhtml Log: add fix for IE6 Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ind= ex/status.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8696210824840488780==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 07:09:59 2009 Content-Type: multipart/mixed; boundary="===============8868177060641068785==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14000 - trunk/examples/photoalbum/source/web/src/main/webapp/scripts. Date: Mon, 04 May 2009 07:07:30 -0400 Message-ID: --===============8868177060641068785== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-04 07:07:30 -0400 (Mon, 04 May 2009) New Revision: 14000 Modified: trunk/examples/photoalbum/source/web/src/main/webapp/scripts/photoalbum.= js Log: fix for = IE6 footer position Modified: trunk/examples/photoalbum/source/web/src/main/webapp/scripts/phot= oalbum.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/webapp/scripts/photoalbum= .js 2009-05-04 11:07:03 UTC (rev 13999) +++ trunk/examples/photoalbum/source/web/src/main/webapp/scripts/photoalbum= .js 2009-05-04 11:07:30 UTC (rev 14000) @@ -22,4 +22,15 @@ } = } +} + +// fix IE6 footer position +function kickLayout(selector) { + = + if(Richfaces && Richfaces.browser.isIE6) { + var element =3D jQuery(selector); + if(element) { + element.css('zoom','normal').css('zoom','100%'); + } + } = } \ No newline at end of file --===============8868177060641068785==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 07:27:46 2009 Content-Type: multipart/mixed; boundary="===============7756211594671971483==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14001 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples. Date: Mon, 04 May 2009 07:25:17 -0400 Message-ID: --===============7756211594671971483== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-04 07:25:17 -0400 (Mon, 04 May 2009) New Revision: 14001 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/example= s/modifiableModel.xhtml Log: condition added to avoid unnesessary data calls Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/= examples/modifiableModel.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/exampl= es/modifiableModel.xhtml 2009-05-04 11:07:30 UTC (rev 14000) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/exampl= es/modifiableModel.xhtml 2009-05-04 11:25:17 UTC (rev 14001) @@ -8,7 +8,7 @@ + rowKeyConverter=3D"#{longConverter}" reRender=3D"datascroller" rendered= =3D"#{componentNavigator.currentComponent.activeTab =3D=3D 'modifiableDataM= odel'}"> --===============1455303846875795764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-04 07:38:21 -0400 (Mon, 04 May 2009) New Revision: 14002 Modified: trunk/examples/photoalbum/source/ejb/sql/full/import.sql trunk/examples/photoalbum/source/ejb/sql/short/import.sql Log: Modified: trunk/examples/photoalbum/source/ejb/sql/full/import.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/sql/full/import.sql 2009-05-04 11:= 25:17 UTC (rev 14001) +++ trunk/examples/photoalbum/source/ejb/sql/full/import.sql 2009-05-04 11:= 38:21 UTC (rev 14002) @@ -2,14 +2,14 @@ INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (2, 'Nick', 'Curtis', 'nkur= tis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964'= , '1978-01-08', 1, 0, true); INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (3, 'John', 'Smith', 'jsmi= th(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964'= , '1970-01-08', 1, 0, true); = -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature pictures', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature pictures', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature pictures', 2, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature pictures', 3, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature images', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature images', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature images', 2, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature images', 3, '2009-12-18', true); --------------------------------------------------------------------- -- ALBUM - Animals" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals pictures', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals images', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (0, 'Animals'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (0,= '1750979205_6e51b47ce9_o.jpg', '1750979205_6e51b47ce9_o.jpg', 'Animals - 1= 750979205_6e51b47ce9_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024= , 1917, 768, '2009-12-01', true, true); @@ -73,7 +73,7 @@ --------------------------------------------------------------------- -- ALBUM - Cars" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars pictures', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars images', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (1, 'Cars'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16= , '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 19019= 3308_ce2a4de5fa_o.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 76= 8, '2009-12-01', true, true); @@ -134,7 +134,7 @@ --------------------------------------------------------------------- -- ALBUM - Monuments and just buildings" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings pictures', 4, '= 2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings images', 4, '20= 09-12-18'); INSERT INTO MetaTag(id, tag) VALUES (2, 'Monuments and just buildings'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (30= , '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[= 303x457].jpg image', '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, = 768, '2009-12-01', true, true); @@ -229,7 +229,7 @@ --------------------------------------------------------------------- -- ALBUM - Nature" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature pictures', 2, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature images', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (3, 'Nature'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (51= , '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image', = '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true); @@ -320,7 +320,7 @@ --------------------------------------------------------------------- -- ALBUM - Portrait" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait pictures', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait images', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (4, 'Portrait'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (73= , '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',= '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true); @@ -403,7 +403,7 @@ --------------------------------------------------------------------- -- ALBUM - Sport" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport pictures', 4, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport images', 4, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (5, 'Sport'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (90= , '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 1031= 93233_860c47c909_o.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 1917,= 768, '2009-12-01', true, true); @@ -467,7 +467,7 @@ --------------------------------------------------------------------- -- ALBUM - Water" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water pictures', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water images', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (6, 'Water'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 5, '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 117= 215467_5cccef9aaa_b.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77',= 1024, 1917, 768, '2009-12-01', true, true); Modified: trunk/examples/photoalbum/source/ejb/sql/short/import.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/sql/short/import.sql 2009-05-04 11= :25:17 UTC (rev 14001) +++ trunk/examples/photoalbum/source/ejb/sql/short/import.sql 2009-05-04 11= :38:21 UTC (rev 14002) @@ -2,14 +2,14 @@ INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (2, 'Nick', 'Curtis', 'nkur= tis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964'= , '1978-01-08', 1, 0, true); INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (3, 'John', 'Smith', 'jsmi= th(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964'= , '1970-01-08', 1, 0, true); = -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature pictures', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature pictures', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature pictures', 2, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature pictures', 3, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature images', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature images', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature images', 2, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature images', 3, '2009-12-18', true); --------------------------------------------------------------------- -- ALBUM - Animals" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals pictures', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals images', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (0, 'Animals'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (0,= '1750979205_6e51b47ce9_o.jpg', '1750979205_6e51b47ce9_o.jpg', 'Animals - 1= 750979205_6e51b47ce9_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024= , 1917, 768, '2009-12-01', true, true); @@ -34,7 +34,7 @@ --------------------------------------------------------------------- -- ALBUM - Cars" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars pictures', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars images', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (1, 'Cars'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (4,= '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 190193= 308_ce2a4de5fa_o.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024= , 1917, 768, '2009-12-01', true, true); @@ -57,7 +57,7 @@ --------------------------------------------------------------------- -- ALBUM - Monuments and just buildings" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings pictures', 4, '= 2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings images', 4, '20= 09-12-18'); INSERT INTO MetaTag(id, tag) VALUES (2, 'Monuments and just buildings'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8,= '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[3= 03x457].jpg image', '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-1= 2-01', true, true); @@ -77,7 +77,7 @@ --------------------------------------------------------------------- -- ALBUM - Nature" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature pictures', 2, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature images', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (3, 'Nature'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12= , '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image', = '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true); @@ -100,7 +100,7 @@ --------------------------------------------------------------------- -- ALBUM - Portrait" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait pictures', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait images', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (4, 'Portrait'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16= , '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',= '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true); @@ -122,7 +122,7 @@ --------------------------------------------------------------------- -- ALBUM - Sport" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport pictures', 4, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport images', 4, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (5, 'Sport'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20= , '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 1031= 93233_860c47c909_o.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040',= 1024, 1917, 768, '2009-12-01', true, true); @@ -145,7 +145,7 @@ --------------------------------------------------------------------- -- ALBUM - Water" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water pictures', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water images', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (6, 'Water'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24= , '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 1172= 15467_5cccef9aaa_b.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 7= 68, '2009-12-01', true, true); --===============1455303846875795764==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 09:27:16 2009 Content-Type: multipart/mixed; boundary="===============4761916992906033113==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14003 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: dataTable and 3 other directories. Date: Mon, 04 May 2009 09:24:45 -0400 Message-ID: --===============4761916992906033113== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-04 09:24:45 -0400 (Mon, 04 May 2009) New Revision: 14003 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifia= bleModel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.= xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examp= les/flashSampleDynamic.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage= .xhtml Log: descriptions added Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/= modifiableModel.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -8,8 +8,15 @@

- Descriptions + This is another sample of ExtendedDataModel implementation whic= h additionally shows = + how to implement sorting and filtering in your model.

+

+ Model class should extend ExtendedDataTableModel and additional= ly implement = + Modifiable interface. This interface defines modify meth= od. This = + method will be called with lists of sort and filter fields as paramete= rs and should perform sorting and = + filtering according to the fields. = +

= @@ -19,8 +26,8 @@ = = - - + + =
= Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.= xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml = 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml = 2009-05-04 13:24:45 UTC (rev 14003) @@ -15,12 +15,12 @@ = + + + = = - - - = + + + + + = + =
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutpu= t/examples/flashSampleDynamic.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/flashSampleDynamic.xhtml 2009-05-04 11:38:21 UTC (rev 14002) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/exam= ples/flashSampleDynamic.xhtml 2009-05-04 13:24:45 UTC (rev 14003) @@ -7,9 +7,6 @@ = =

SWF Movie:

- - - =
+

+ Note for SWF sample. Using scripts loading strategy different = from "ALL" you should use additionally load swfObject script by using: + <a4j:loadScript src=3D"resource:///org/richfaces/renderkit/html/= js/swfobject.js" /> +

+ = = --===============4761916992906033113==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 09:41:51 2009 Content-Type: multipart/mixed; boundary="===============6235008517130284876==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14004 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js. Date: Mon, 04 May 2009 09:39:21 -0400 Message-ID: --===============6235008517130284876== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: pyaschenko Date: 2009-05-04 09:39:21 -0400 (Mon, 04 May 2009) New Revision: 14004 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/F= ileUpload.js Log: https://jira.jboss.org/jira/browse/RF-6846 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/ht= ml/js/FileUpload.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/= FileUpload.js 2009-05-04 13:24:45 UTC (rev 14003) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/= FileUpload.js 2009-05-04 13:39:21 UTC (rev 14004) @@ -777,7 +777,7 @@ clear: function(entry, isCancelButton) { if (this.disabled) return; if (entry) { - if (isCancelButton || entry.state =3D=3D FileUploadEntry.UPLOAD_SUCCESS= || entry.state =3D=3D FileUploadEntry.INITIALIZED || entry.state =3D=3D Fi= leUploadEntry.UPLOAD_CANCELED) { + if (isCancelButton || entry.state =3D=3D FileUploadEntry.UPLOAD_SUCCESS= || entry.state =3D=3D FileUploadEntry.INITIALIZED) { this.remove(entry); if(this.events.onclear) { = this.element.fire("rich:onclear", {entry : entry}); --===============6235008517130284876==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 10:51:55 2009 Content-Type: multipart/mixed; boundary="===============5007553572731575825==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14005 - in trunk/framework: api/src/main/java/org/richfaces/skin and 2 other directories. Date: Mon, 04 May 2009 10:49:24 -0400 Message-ID: --===============5007553572731575825== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-04 10:49:24 -0400 (Mon, 04 May 2009) New Revision: 14005 Added: trunk/framework/api/src/main/java/org/richfaces/skin/ThemeNotFoundExcept= ion.java Modified: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.ja= va trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties Log: https://jira.jboss.org/jira/browse/RF-6939 Modified: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2009-05-04= 13:39:21 UTC (rev 14004) +++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2009-05-04= 14:49:24 UTC (rev 14005) @@ -288,6 +288,7 @@ public static final String DEFAULT_PROPERTIES_NOT_FOUND_ERROR =3D "DEFAUL= T_PROPERTIES_NOT_FOUND_ERROR"; public static final String SKIN_PROPERTIES_IO_ERROR =3D "SKIN_PROPERTIES_= IO_ERROR"; public static final String SKIN_NOT_FOUND_ERROR =3D "SKIN_NOT_FOUND_ERROR= "; + public static final String THEME_NOT_FOUND_ERROR =3D "THEME_NOT_FOUND_ERR= OR"; public static final String ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR =3D "ACE= SSING_SKIN_PROPERTY_AS_ARRAY_ERROR"; public static final String ACESSING_SKIN_PROPERTY_ERROR =3D "ACESSING_SKI= N_PROPERTY_ERROR"; public static final String SKIN_PROPERTIES_READ_ONLY_ERROR =3D "SKIN_PROP= ERTIES_READ_ONLY_ERROR"; @@ -364,7 +365,7 @@ public static final String DATASCROLLER_PAGE_MISSING =3D "DATASCROLLER_PA= GE_MISSING"; public static final String DATASCROLLER_PAGES_DIFFERENT =3D "DATASCROLLER= _PAGES_DIFFERENT"; public static final String COMPONENT_CONVERSION_ERROR =3D "COMPONENT_CONV= ERSION_ERROR"; - = + public static void main(String[] args) { String m =3D getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); System.out.println(m); Added: trunk/framework/api/src/main/java/org/richfaces/skin/ThemeNotFoundEx= ception.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/api/src/main/java/org/richfaces/skin/ThemeNotFoundExcep= tion.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/skin/ThemeNotFoundExcep= tion.java 2009-05-04 14:49:24 UTC (rev 14005) @@ -0,0 +1,49 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.richfaces.skin; + +import javax.faces.FacesException; + +public class ThemeNotFoundException extends FacesException { + + /** + * = + */ + private static final long serialVersionUID =3D 2245209384496054860L; + + public ThemeNotFoundException() { + super(); + } + + public ThemeNotFoundException(String arg0) { + super(arg0); + } + + public ThemeNotFoundException(Throwable arg0) { + super(arg0); + } + + public ThemeNotFoundException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactory= Impl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.j= ava 2009-05-04 13:39:21 UTC (rev 14004) +++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.j= ava 2009-05-04 14:49:24 UTC (rev 14005) @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -370,7 +369,13 @@ public Theme getTheme(FacesContext facesContext, String name) { Theme theme =3D themes.get(name); if(null =3D=3D theme){ - Properties properties =3D loadProperties(name, THEME_PATHS); + Properties properties; + try { + properties =3D loadProperties(name, THEME_PATHS); + } catch (SkinNotFoundException e) { + throw new ThemeNotFoundException(Messages.getMessage( + Messages.THEME_NOT_FOUND_ERROR, name), e.getCause()); + } processProperties(facesContext, properties); theme =3D new ThemeImpl(properties); themes.put(name, theme); Modified: trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.pro= perties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.propertie= s 2009-05-04 13:39:21 UTC (rev 14004) +++ trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.propertie= s 2009-05-04 14:49:24 UTC (rev 14005) @@ -180,8 +180,9 @@ NULL_SKIN_NAME_ERROR=3DName for current Skin calculated as null CREATE_SKIN_INFO=3DCreate new Skin instance for name {0} = DEFAULT_PROPERTIES_NOT_FOUND_ERROR=3DDefault properties for skin not found= in {0} -SKIN_PROPERTIES_IO_ERROR=3DAttempt to load Skin property file caused IOErr= or +SKIN_PROPERTIES_IO_ERROR=3DAttempt to load property file caused IOError SKIN_NOT_FOUND_ERROR=3DSkin with name {0} not found +THEME_NOT_FOUND_ERROR=3DTheme with name {0} not found ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR=3DAttempt to access to skin property= as array ACESSING_SKIN_PROPERTY_ERROR=3DAttempt to access to skin property not as s= tring parameter SKIN_PROPERTIES_READ_ONLY_ERROR=3DSkin properties is read-only = @@ -258,4 +259,4 @@ INVALID_VALUE=3D"Component {0} has invalid value expression {1}" DATASCROLLER_PAGE_MISSING=3DDatascroller {0}: The requested page #{1} isn'= 't found in the model containing {2} pages. Paging is reset to page #{3} DATASCROLLER_PAGES_DIFFERENT=3DDatascroller components attached to compone= nt\: {0} have different values of ''page'' attribute \: {1} -COMPONENT_CONVERSION_ERROR=3DComponent {0}: conversion error occurred for = value {1} \ No newline at end of file +COMPONENT_CONVERSION_ERROR=3DComponent {0}\: conversion error occurred for= value {1} \ No newline at end of file --===============5007553572731575825==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 11:45:42 2009 Content-Type: multipart/mixed; boundary="===============4508185831057311061==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14006 - in trunk/examples/photoalbum: tests/src/test/java/org/richfaces/photoalbum and 1 other directories. Date: Mon, 04 May 2009 11:08:55 -0400 Message-ID: --===============4508185831057311061== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-04 11:08:55 -0400 (Mon, 04 May 2009) New Revision: 14006 Added: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/t= estng/SearchTest.java Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/Controller.java trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/R= ealWorldHelper.java Log: add search test Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/Controller.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-04 14:49:24 UTC (rev 14005) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-04 15:08:55 UTC (rev 14006) @@ -290,11 +290,11 @@ } = private boolean canViewAlbum(Album album) { - return album !=3D null && album.getShelf() !=3D null && album.getShelf()= .isShared() || album.isOwner(user); + return album !=3D null && album.getShelf() !=3D null && (album.getShelf(= ).isShared() || album.isOwner(user)); } = private boolean canViewImage(Image image) { - return image !=3D null && image.getAlbum() !=3D null && image.getAlbum()= .getShelf() !=3D null && image.getAlbum().getShelf().isShared() || image.is= Owner(user); + return image !=3D null && image.getAlbum() !=3D null && image.getAlbum()= .getShelf() !=3D null && (image.getAlbum().getShelf().isShared() || image.i= sOwner(user)); } = private void pushEvent(String type, Object... parameters) { Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photo= album/RealWorldHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= RealWorldHelper.java 2009-05-04 14:49:24 UTC (rev 14005) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= RealWorldHelper.java 2009-05-04 15:08:55 UTC (rev 14006) @@ -118,10 +118,31 @@ public static interface FilesUploadArea { String FILE_UPLOAD_ID =3D IndexPage.MAIN_FORM_ID + ":fileUpload"; } - = + public static interface TreeArea { - = + } + + public static interface Search { + String SEARCH_INPUT =3D "//*[@class=3D'search-input']"; + String SEARCH_BUTTON =3D "//*[@class=3D'search-find-button']"; + String SEARCH_OPTION =3D "//*[@class=3D'search-option-link']"; + + String INACTIVE_TAB =3D "//*[@class=3D'dr-tbpnl-tb rich-tab-header dr-t= bpnl-tb-inact rich-tab-inactive']"; + String ACTIVE_TAB =3D "//*[@class=3D'dr-tbpnl-tbcell-act rich-tabhdr-ce= ll-active']"; + + String SEARCH_CRITERIA_KEYWORDS =3D "//*[@class=3D'search-criteria'][2]= "; + String SEARCH_CRITERIA_OBJECTS =3D "//*[@class=3D'search-criteria'][1]/= strong"; + String OBJECTS_MY =3D "//*[@class=3D'search-options-div1']/input[1]"; + String OBJECTS_SHARED =3D "//*[@class=3D'search-options-div1']/input[2]= "; + + String OBJETCS_SHELVES =3D "//*[@class=3D'search-options-div2']//span[c= ontains(. , 'Shelves')]/input"; + String OBJETCS_ALBUMS =3D "//*[@class=3D'search-options-div2']//span[co= ntains(. , 'Albums')]/input"; + String OBJETCS_IMAGES =3D "//*[@class=3D'search-options-div2']//span[co= ntains(. , 'Images')]/input"; + String OBJETCS_USERS =3D "//*[@class=3D'search-options-div2']//span[con= tains(. , 'Users')]/input"; + String OBJETCS_TAGS =3D "//*[@class=3D'search-options-div2']//span[cont= ains(. , 'Tags')]/input"; + + } } = public static void login(Selenium selenium) { Added: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalb= um/testng/SearchTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= testng/SearchTest.java (rev 0) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= testng/SearchTest.java 2009-05-04 15:08:55 UTC (rev 14006) @@ -0,0 +1,160 @@ +package org.richfaces.photoalbum.testng; + +import org.richfaces.photoalbum.RealWorldHelper; +import org.richfaces.photoalbum.SeleniumTestBase; +import org.testng.Assert; +import org.testng.annotations.Test; + +import static org.richfaces.photoalbum.RealWorldHelper.HtmlConstants.Searc= h.*; + +/** + * @user: akolonitsky + * Date: Apr 29, 2009 + */ +public class SearchTest extends SeleniumTestBase { + private static final String NATURE =3D "nature"; + private static final String SPORT =3D "sport"; + + private static final String OBJECTS_ALL =3D "Shelves,Albums,Images,Users,= Tag"; + private static final String OBJECT_TAG =3D "Tag"; + + private static final String SHELF_HEADER =3D "//*[@class=3D'shelf-header-= table']"; + private static final String KEYWORDS =3D "Keywords: "; + + + @Test + public void testSearchForSimpleUser() { + renderPage(); + + checkResult(NATURE, 4, 4, OBJECTS_ALL); + } + + @Test + public void testSearch() { + renderPage(); + + RealWorldHelper.login(selenium); + + selenium.click(SEARCH_OPTION); + selenium.check(OBJECTS_MY); + selenium.check(OBJECTS_SHARED); + + checkResult(NATURE, 2, 4, OBJECTS_ALL); + } + + @Test + public void testSearchOnMyOnly() { + renderPage(); + + RealWorldHelper.login(selenium); + + selenium.click(SEARCH_OPTION); + selenium.check(OBJECTS_MY); + selenium.uncheck(OBJECTS_SHARED); + + checkResult(SPORT, 1, 4, OBJECTS_ALL); + } + + @Test + public void testSearchOnSharedOnly() { + renderPage(); + + RealWorldHelper.login(selenium); + + selenium.click(SEARCH_OPTION); + selenium.uncheck(OBJECTS_MY); + selenium.check(OBJECTS_SHARED); + + checkResult(SPORT, 1, 4, OBJECTS_ALL); + } + + @Test + public void testSearchOnMyTags() { + renderPage(); + + RealWorldHelper.login(selenium); + + selenium.click(SEARCH_OPTION); + selenium.check(OBJECTS_MY); + selenium.uncheck(OBJECTS_SHARED); + + selenium.uncheck(OBJETCS_SHELVES); + selenium.uncheck(OBJETCS_ALBUMS); + selenium.uncheck(OBJETCS_IMAGES); + selenium.uncheck(OBJETCS_USERS); + selenium.check (OBJETCS_TAGS); + + checkResult(SPORT, 0, 0, OBJECT_TAG); + + Assert.assertEquals(1, selenium.getXpathCount("//*[@class=3D'dr-tbpnl-cn= tnt rich-tabpanel-content']//a")); + } + + + private void checkResult(final String searchValue, final int shelfCount, = final int inactiveTabCount, final String searchObjects) { + selenium.type(SEARCH_INPUT, searchValue); + selenium.click(SEARCH_BUTTON); + waitForAjaxCompletion(); + + Assert.assertEquals(1, selenium.getXpathCount(ACTIVE_TAB)); + + Assert.assertEquals(searchObjects, selenium.getText(SEARCH_CRITERIA_OBJE= CTS).trim()); + Assert.assertEquals(KEYWORDS + searchValue, selenium.getText(SEARCH_CRIT= ERIA_KEYWORDS).trim()); + + Assert.assertEquals(shelfCount, selenium.getXpathCount(SHELF_HEADER)); + Assert.assertEquals(inactiveTabCount, selenium.getXpathCount(INACTIVE_TA= B)); + } + + +// @Test +// public void testClickOnFirstAlbum() { + +// renderPage(); +// +// RealWorldHelper.login(selenium); +// +//// final String natureShelf =3D "//table[//p[contains(. , 'Nature')] an= d //*[@class=3D'shelf-header-table']]"; +// final String natuteAlbumsXPath =3D "//div[@class=3D'preview_box_album_= 120' and ../" + getShelfHeaderCondition("Nature") + "]"; +// Assert.assertEquals(selenium.getXpathCount(natuteAlbumsXPath).intValue= (), 2); +// +// final String albumContainer =3D "//div[@class=3D'preview_box_album_120= ']"; +// final String firstAlbumXPath =3D albumContainer + "[1]//a"; +// final String sportShelfOnTreeXPath =3D "//*[@id=3D'treeform:tree']//sp= an[span[contains(text(), 'Sport')]]"; +// +//// ajaxClick(sportShelfOnTreeXPath); +// +// String compId =3D "treeform:j_id146"; +// +// selenium.click("//*[@id=3D'"+ compId + ":childs']/table[1]/tbody/tr/td= [1]/div/a/img[2]"); +// +// String britneyAlbumXpath =3D "//*[@id=3D'"+ compId + ":childs']/div[1]= /table/tbody/tr/td[3]"; +// String britney1stSongXpath =3D "//*[@id=3D'"+ compId + ":childs']/div[= 1]/div/table/tbody/tr/td[3]"; +// +// String natureShelfXpath =3D "//*[@id=3D'"+ compId + ":childs']/table[1= ]/tbody/tr/td[3]"; +// String natureAlbumXpath =3D "//*[@id=3D'"+ compId + ":childs']/div[1]/= table[1]/tbody/tr/td[3]"; +// int natureAlbumsCount =3D selenium.getXpathCount("//*[@id=3D'"+ compId= + ":childs']/div[1]/table").intValue(); +// +// selenium.click("//*[@id=3D'"+ compId + ":childs']/table[2]/tbody/tr/td= [1]/div/a/img[2]"); +// String sportShelfXpath =3D "//*[@id=3D'"+ compId + ":childs']/table[2]= /tbody/tr/td[3]"; +// String sportAlbumXpath =3D "//*[@id=3D'"+ compId + ":childs']/div[2]/t= able[1]/tbody/tr/td[3]"; +// int sportAlbumsCount =3D selenium.getXpathCount("//*[@id=3D'"+ compId = + ":childs']/div[2]/table").intValue(); +// +// selenium.dragAndDropToObject(natureAlbumXpath, sportShelfXpath); +// waitForAjaxCompletion(); +// assertChildNodesCount(natureAlbumsCount - 1, "//*[@id=3D'"+ compId + "= :childs']/div[1]/table", "Song is not dragged"); +// assertChildNodesCount(sportAlbumsCount - 1, "//*[@id=3D'"+ compId + ":= childs']/div[2]/table", "Song is not dropped"); +// +// selenium.dragAndDropToObject(sportAlbumXpath, natureShelfXpath); +// waitForAjaxCompletion(); +// assertChildNodesCount(natureAlbumsCount, "//*[@id=3D'"+ compId + ":chi= lds']/div[1]/table", "Song is not dragged back"); +// assertChildNodesCount(sportAlbumsCount, "//*[@id=3D'"+ compId + ":chil= ds']/div[2]/table", "Song is not dropped back"); +// +// +//// selenium.getXpathCount("//*[@id=3D'treeform:tree']//*[@class=3D'dr-t= ree-full-width rich-tree-node rich-cm-attached'][last()]/tbody/tr/td[3]"); +// selenium.dragAndDropToObject("//*[@id=3D'mainform:shelves:0:userAlbums= :0:img']", "//*[@id=3D'treeform:j_id146:childs']"); +//// selenium.dragAndDrop(firstAlbumXPath, sportShelfOnTreeXPath); +// waitForAjaxCompletion(); +// +// Assert.assertEquals(selenium.getXpathCount(natuteAlbumsXPath).intValue= (), 1); +// } +// +} --===============4508185831057311061==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 11:45:42 2009 Content-Type: multipart/mixed; boundary="===============5038244212668158951==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14008 - trunk/ui/contextMenu/src/main/java/org/richfaces/component. Date: Mon, 04 May 2009 11:23:57 -0400 Message-ID: --===============5038244212668158951== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-04 11:23:57 -0400 (Mon, 04 May 2009) New Revision: 14008 Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu= .java Log: ContextMenu: incorrect default value of the disableDefaultMenu attribute. https://jira.jboss.org/jira/browse/RF-6940 Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UICont= extMenu.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMen= u.java 2009-05-04 15:14:08 UTC (rev 14007) +++ trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMen= u.java 2009-05-04 15:23:57 UTC (rev 14008) @@ -57,7 +57,7 @@ = public boolean isDisableDefaultMenu() { if (this.disableDefaultMenuSet) { - return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent()); + return this.disableDefaultMenu; } = ValueExpression ve =3D getValueExpression(DISABLE_DEFAULT_MENU); @@ -72,7 +72,7 @@ } } = - return this.disableDefaultMenu; + return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent()); } = public void setDisableDefaultMenu(boolean disableDefault) { --===============5038244212668158951==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 11:45:43 2009 Content-Type: multipart/mixed; boundary="===============7231492333188892132==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14007 - in tags: 3.3.1.CR2 and 212 other directories. Date: Mon, 04 May 2009 11:14:09 -0400 Message-ID: --===============7231492333188892132== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-04 11:14:08 -0400 (Mon, 04 May 2009) New Revision: 14007 Added: tags/3.3.1.CR2/ Modified: tags/3.3.1.CR2/cdk/generator/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/src/main/resources/arch= etype-resources/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/src/main/resources/archetyp= e-resources/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/src/main/resources/archet= ype-resources/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-seam-app/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-seam-app/src/main/resources/archetype= -resources/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-theme/pom.xml tags/3.3.1.CR2/cdk/maven-archetype-theme/src/main/resources/archetype-re= sources/pom.xml tags/3.3.1.CR2/cdk/maven-cdk-plugin/pom.xml tags/3.3.1.CR2/cdk/maven-javascript-plugin/pom.xml tags/3.3.1.CR2/cdk/maven-resource-dependency-plugin/pom.xml tags/3.3.1.CR2/cdk/pom.xml tags/3.3.1.CR2/docs/cdkguide/en/pom.xml tags/3.3.1.CR2/docs/cdkguide/pom.xml tags/3.3.1.CR2/docs/common-resources/en/pom.xml tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_ar= chetype/pom.xml tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_ar= chetype/src/main/resources/archetype-resources/en/pom.xml tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_ar= chetype/src/main/resources/archetype-resources/pom.xml tags/3.3.1.CR2/docs/common-resources/pom.xml tags/3.3.1.CR2/docs/faq/en/pom.xml tags/3.3.1.CR2/docs/faq/pom.xml tags/3.3.1.CR2/docs/highlight/pom.xml tags/3.3.1.CR2/docs/migrationguide/en/pom.xml tags/3.3.1.CR2/docs/migrationguide/pom.xml tags/3.3.1.CR2/docs/pom.xml tags/3.3.1.CR2/docs/realworld_app_guide/en/pom.xml tags/3.3.1.CR2/docs/realworld_app_guide/pom.xml tags/3.3.1.CR2/docs/userguide/en/pom.xml tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCGettingStar= ted.xml tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCarchitectov= er.xml tags/3.3.1.CR2/docs/userguide/pom.xml tags/3.3.1.CR2/examples/photoalbum/pom.xml tags/3.3.1.CR2/examples/photoalbum/source/ear/maven-build.xml tags/3.3.1.CR2/examples/photoalbum/source/pom.xml tags/3.3.1.CR2/examples/photoalbum/source/web/maven-build.xml tags/3.3.1.CR2/extensions/gwt/pom.xml tags/3.3.1.CR2/extensions/pom.xml tags/3.3.1.CR2/extensions/seam/pom.xml tags/3.3.1.CR2/extensions/trinidad/pom.xml tags/3.3.1.CR2/framework/api/pom.xml tags/3.3.1.CR2/framework/impl/pom.xml tags/3.3.1.CR2/framework/impl/src/main/java/org/richfaces/VersionBean.ja= va tags/3.3.1.CR2/framework/jsf-test/pom.xml tags/3.3.1.CR2/framework/pom.xml tags/3.3.1.CR2/framework/test/pom.xml tags/3.3.1.CR2/pom.xml tags/3.3.1.CR2/samples/beanValidatorSample/pom.xml tags/3.3.1.CR2/samples/calendar-sample/pom.xml tags/3.3.1.CR2/samples/colorPickerDemo/pom.xml tags/3.3.1.CR2/samples/columnsDemo/pom.xml tags/3.3.1.CR2/samples/combobox-sample/pom.xml tags/3.3.1.CR2/samples/contextMenuDemo/pom.xml tags/3.3.1.CR2/samples/createProject.sh tags/3.3.1.CR2/samples/darkX/pom.xml tags/3.3.1.CR2/samples/dataFilterSliderDemo/pom.xml tags/3.3.1.CR2/samples/dataTableDemo/pom.xml tags/3.3.1.CR2/samples/datascroller-sample/pom.xml tags/3.3.1.CR2/samples/dragDropDemo/pom.xml tags/3.3.1.CR2/samples/dropdownmenu-sample/pom.xml tags/3.3.1.CR2/samples/editor-sample/pom.xml tags/3.3.1.CR2/samples/editorSeam-sample/pom.xml tags/3.3.1.CR2/samples/effect-sample/pom.xml tags/3.3.1.CR2/samples/extendedDataTable-sample/pom.xml tags/3.3.1.CR2/samples/fileUploadDemo/pom.xml tags/3.3.1.CR2/samples/functions-demo/pom.xml tags/3.3.1.CR2/samples/glassX/pom.xml tags/3.3.1.CR2/samples/gmap-sample/pom.xml tags/3.3.1.CR2/samples/hotKey-sample/pom.xml tags/3.3.1.CR2/samples/inplaceInput-sample/pom.xml tags/3.3.1.CR2/samples/inplaceSelect-sample/pom.xml tags/3.3.1.CR2/samples/inputNumberSliderDemo/pom.xml tags/3.3.1.CR2/samples/inputNumberSpinnerDemo/pom.xml tags/3.3.1.CR2/samples/jQuery-sample/pom.xml tags/3.3.1.CR2/samples/jira-data/pom.xml tags/3.3.1.CR2/samples/laguna/pom.xml tags/3.3.1.CR2/samples/layout-sample/pom.xml tags/3.3.1.CR2/samples/listShuttleDemo/pom.xml tags/3.3.1.CR2/samples/local-value-demo/pom.xml tags/3.3.1.CR2/samples/modalpanel-sample/pom.xml tags/3.3.1.CR2/samples/orderingListDemo/pom.xml tags/3.3.1.CR2/samples/panel-sample/pom.xml tags/3.3.1.CR2/samples/panelbar-sample/pom.xml tags/3.3.1.CR2/samples/panelmenu-sample/pom.xml tags/3.3.1.CR2/samples/pickList-sample/pom.xml tags/3.3.1.CR2/samples/pom.xml tags/3.3.1.CR2/samples/progressBarDemo/pom.xml tags/3.3.1.CR2/samples/queue-sample/pom.xml tags/3.3.1.CR2/samples/rich-message-demo/pom.xml tags/3.3.1.CR2/samples/richfaces-art-datatable/pom.xml tags/3.3.1.CR2/samples/richfaces-demo/pom.xml tags/3.3.1.CR2/samples/richfaces-ear-demo/ejb/pom.xml tags/3.3.1.CR2/samples/richfaces-ear-demo/pom.xml tags/3.3.1.CR2/samples/richfaces-ear-demo/richfacesEAR/pom.xml tags/3.3.1.CR2/samples/richfaces-ear-demo/webapp/pom.xml tags/3.3.1.CR2/samples/scrollableDataTableDemo/pom.xml tags/3.3.1.CR2/samples/seamEAR/ear/pom.xml tags/3.3.1.CR2/samples/seamEAR/ejbs/pom.xml tags/3.3.1.CR2/samples/seamEAR/pom.xml tags/3.3.1.CR2/samples/seamEAR/primary-source/pom.xml tags/3.3.1.CR2/samples/seamEAR/projects/logging/pom.xml tags/3.3.1.CR2/samples/seamEAR/projects/pom.xml tags/3.3.1.CR2/samples/seamEAR/wars/pom.xml tags/3.3.1.CR2/samples/seamEAR/wars/seamWebapp/pom.xml tags/3.3.1.CR2/samples/seamIntegration/pom.xml tags/3.3.1.CR2/samples/separator-sample/pom.xml tags/3.3.1.CR2/samples/simpleTogglePanel-sample/pom.xml tags/3.3.1.CR2/samples/skins/pom.xml tags/3.3.1.CR2/samples/sortingFilteringDemo/pom.xml tags/3.3.1.CR2/samples/state-sample/pom.xml tags/3.3.1.CR2/samples/stdcomponents-sample/pom.xml tags/3.3.1.CR2/samples/suggestionbox-sample/pom.xml tags/3.3.1.CR2/samples/tabPanelDemo/pom.xml tags/3.3.1.CR2/samples/themes/pom.xml tags/3.3.1.CR2/samples/togglePanel-sample/pom.xml tags/3.3.1.CR2/samples/tomahawkCompability/pom.xml tags/3.3.1.CR2/samples/toolBarDemo/pom.xml tags/3.3.1.CR2/samples/tooltip-sample/pom.xml tags/3.3.1.CR2/samples/tree-demo/pom.xml tags/3.3.1.CR2/samples/treeModelDemo/pom.xml tags/3.3.1.CR2/samples/virtualEarth-sample/pom.xml tags/3.3.1.CR2/sandbox/api/pom.xml tags/3.3.1.CR2/sandbox/cdk/pom.xml tags/3.3.1.CR2/sandbox/impl/pom.xml tags/3.3.1.CR2/sandbox/pom.xml tags/3.3.1.CR2/sandbox/samples/dialog-window-sample/pom.xml tags/3.3.1.CR2/sandbox/samples/editorOld-sample/pom.xml tags/3.3.1.CR2/sandbox/samples/fileUploadPOC/pom.xml tags/3.3.1.CR2/sandbox/samples/maven-rd-plugin-sample/pom.xml tags/3.3.1.CR2/sandbox/samples/panel2-sample/pom.xml tags/3.3.1.CR2/sandbox/samples/pom.xml tags/3.3.1.CR2/sandbox/samples/rex-demo/pom.xml tags/3.3.1.CR2/sandbox/samples/simpleTogglePanel2-sample/pom.xml tags/3.3.1.CR2/sandbox/ui/create.bat tags/3.3.1.CR2/sandbox/ui/create.sh tags/3.3.1.CR2/sandbox/ui/dialog-window/pom.xml tags/3.3.1.CR2/sandbox/ui/editorOld/pom.xml tags/3.3.1.CR2/sandbox/ui/panel2/pom.xml tags/3.3.1.CR2/sandbox/ui/pom.xml tags/3.3.1.CR2/sandbox/ui/rex-button/pom.xml tags/3.3.1.CR2/sandbox/ui/rex-messageBox/pom.xml tags/3.3.1.CR2/sandbox/ui/rex-resizable/pom.xml tags/3.3.1.CR2/sandbox/ui/simpleTogglePanel2/pom.xml tags/3.3.1.CR2/sandbox/ui/sortableHeader/pom.xml tags/3.3.1.CR2/sandbox/ui/treeTable/pom.xml tags/3.3.1.CR2/test-applications/ajaxTest/pom.xml tags/3.3.1.CR2/test-applications/automator/pom.xml tags/3.3.1.CR2/test-applications/facelets/pom.xml tags/3.3.1.CR2/test-applications/jsp/pom.xml tags/3.3.1.CR2/test-applications/pom.xml tags/3.3.1.CR2/test-applications/regressionArea/pom.xml tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ear/pom.x= ml tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ejb/pom.x= ml tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-tests/pom= .xml tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-web/pom.x= ml tags/3.3.1.CR2/test-applications/richfaces-docs/pom.xml tags/3.3.1.CR2/test-applications/richfaces-docs/web/pom.xml tags/3.3.1.CR2/test-applications/seamApp/pom.xml tags/3.3.1.CR2/test-applications/seleniumTest/pom.xml tags/3.3.1.CR2/test-applications/seleniumTest/richfaces/pom.xml tags/3.3.1.CR2/test-applications/seleniumTest/samples/pom.xml tags/3.3.1.CR2/ui/assembly/pom.xml tags/3.3.1.CR2/ui/beanValidator/pom.xml tags/3.3.1.CR2/ui/calendar/pom.xml tags/3.3.1.CR2/ui/colorPicker/pom.xml tags/3.3.1.CR2/ui/columns/pom.xml tags/3.3.1.CR2/ui/combobox/pom.xml tags/3.3.1.CR2/ui/componentControl/pom.xml tags/3.3.1.CR2/ui/contextMenu/pom.xml tags/3.3.1.CR2/ui/core/pom.xml tags/3.3.1.CR2/ui/create.bat tags/3.3.1.CR2/ui/dataFilterSlider/pom.xml tags/3.3.1.CR2/ui/dataTable/pom.xml tags/3.3.1.CR2/ui/datascroller/pom.xml tags/3.3.1.CR2/ui/drag-drop/pom.xml tags/3.3.1.CR2/ui/dropdown-menu/pom.xml tags/3.3.1.CR2/ui/editor/pom.xml tags/3.3.1.CR2/ui/effect/pom.xml tags/3.3.1.CR2/ui/extendedDataTable/pom.xml tags/3.3.1.CR2/ui/fileUpload/pom.xml tags/3.3.1.CR2/ui/functions/pom.xml tags/3.3.1.CR2/ui/gmap/pom.xml tags/3.3.1.CR2/ui/hotKey/pom.xml tags/3.3.1.CR2/ui/inplaceInput/pom.xml tags/3.3.1.CR2/ui/inplaceSelect/pom.xml tags/3.3.1.CR2/ui/inputnumber-slider/pom.xml tags/3.3.1.CR2/ui/inputnumber-spinner/pom.xml tags/3.3.1.CR2/ui/insert/pom.xml tags/3.3.1.CR2/ui/jQuery/pom.xml tags/3.3.1.CR2/ui/layout/pom.xml tags/3.3.1.CR2/ui/listShuttle/pom.xml tags/3.3.1.CR2/ui/menu-components/pom.xml tags/3.3.1.CR2/ui/message/pom.xml tags/3.3.1.CR2/ui/modal-panel/pom.xml tags/3.3.1.CR2/ui/orderingList/pom.xml tags/3.3.1.CR2/ui/paint2D/pom.xml tags/3.3.1.CR2/ui/panel/pom.xml tags/3.3.1.CR2/ui/panelbar/pom.xml tags/3.3.1.CR2/ui/panelmenu/pom.xml tags/3.3.1.CR2/ui/pickList/pom.xml tags/3.3.1.CR2/ui/pom.xml tags/3.3.1.CR2/ui/progressBAR/pom.xml tags/3.3.1.CR2/ui/scrollableDataTable/pom.xml tags/3.3.1.CR2/ui/separator/pom.xml tags/3.3.1.CR2/ui/simpleTogglePanel/pom.xml tags/3.3.1.CR2/ui/spacer/pom.xml tags/3.3.1.CR2/ui/state/pom.xml tags/3.3.1.CR2/ui/suggestionbox/pom.xml tags/3.3.1.CR2/ui/tabPanel/pom.xml tags/3.3.1.CR2/ui/togglePanel/pom.xml tags/3.3.1.CR2/ui/toolBar/pom.xml tags/3.3.1.CR2/ui/tooltip/pom.xml tags/3.3.1.CR2/ui/tree/pom.xml tags/3.3.1.CR2/ui/treeModel/pom.xml tags/3.3.1.CR2/ui/treeTable/pom.xml tags/3.3.1.CR2/ui/virtualEarth/pom.xml Log: create tag for 3.3.1.CR2 Copied: tags/3.3.1.CR2 (from rev 13996, trunk) Modified: tags/3.3.1.CR2/cdk/generator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/generator/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/generator/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,93 +1,93 @@ - - - - cdk - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.cdk - generator - 3.3.1-SNAPSHOT - Java Server Faces component generator - - - - maven-compiler-plugin - true - - 1.5 - 1.5 - - - - - - - junit - junit - 3.8.1 - test - - - ant - ant - 1.6.5 - - - velocity - velocity-dep - 1.4 - - - commons-beanutils - commons-beanutils - 1.6 - - - commons-digester - commons-digester - 1.5 - - - javax.faces - jsf-api - 1.2_12 - - - javax.servlet.jsp - jsp-api - 2.1 - - - javax.el - el-api - 1.0 - - - el-impl - el-impl - 1.0 - - - qdox - qdox - 1.6 - - - cglib - cglib - 2.1_3 - - - wutka - dtdparser - 1.21 - - - xerces - xercesImpl - 2.8.1 - - + + + + cdk + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.cdk + generator + 3.3.1.CR2 + Java Server Faces component generator + + + + maven-compiler-plugin + true + + 1.5 + 1.5 + + + + + + + junit + junit + 3.8.1 + test + + + ant + ant + 1.6.5 + + + velocity + velocity-dep + 1.4 + + + commons-beanutils + commons-beanutils + 1.6 + + + commons-digester + commons-digester + 1.5 + + + javax.faces + jsf-api + 1.2_12 + + + javax.servlet.jsp + jsp-api + 2.1 + + + javax.el + el-api + 1.0 + + + el-impl + el-impl + 1.0 + + + qdox + qdox + 1.6 + + + cglib + cglib + 2.1_3 + + + wutka + dtdparser + 1.21 + + + xerces + xercesImpl + 2.8.1 + + \ No newline at end of file Modified: tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-jsf-component/pom.xml 2009-05-04 08:26:24 UTC= (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/pom.xml 2009-05-04 15:= 14:08 UTC (rev 14007) @@ -2,11 +2,11 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk maven-archetype-jsf-component - 3.3.1-SNAPSHOT + 3.3.1.CR2 Archetype - maven-archetype-jsf-component \ No newline at end of file Modified: tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/src/main/resourc= es/archetype-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-re= sources/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-jsf-component/src/main/resources/arc= hetype-resources/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -11,7 +11,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 ${groupId} @@ -41,7 +41,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2009-05-04 08:26:24 UTC (re= v 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/pom.xml 2009-05-04 15:14:0= 8 UTC (rev 14007) @@ -2,11 +2,11 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk maven-archetype-jsfwebapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 Archetype for jsf webapp project \ No newline at end of file Modified: tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/src/main/resources/a= rchetype-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resour= ces/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-jsfwebapp/src/main/resources/archety= pe-resources/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -30,7 +30,7 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-plug-n-skin/pom.xml 2009-05-04 08:26:24 UTC (= rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/pom.xml 2009-05-04 15:14= :08 UTC (rev 14007) @@ -2,12 +2,12 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk maven-archetype-plug-n-skin - 3.3.1-SNAPSHOT + 3.3.1.CR2 Archetype - maven-archetype-plug-n-skin = = Modified: tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/src/main/resources= /archetype-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-reso= urces/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-plug-n-skin/src/main/resources/arche= type-resources/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -10,7 +10,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -34,7 +34,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 junit Modified: tags/3.3.1.CR2/cdk/maven-archetype-seam-app/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-seam-app/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-seam-app/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,11 +2,11 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk maven-archetype-seam-app - 3.3.1-SNAPSHOT + 3.3.1.CR2 Archetype - maven-archetype-seam-app \ No newline at end of file Modified: tags/3.3.1.CR2/cdk/maven-archetype-seam-app/src/main/resources/ar= chetype-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-seam-app/src/main/resources/archetype-resourc= es/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-seam-app/src/main/resources/archetyp= e-resources/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -8,7 +8,7 @@ sample application ${artifactId} - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.0.1.GA http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.= zip jboss-4.2.3.GA/jboss-4.2.3.GA/server/default/ Modified: tags/3.3.1.CR2/cdk/maven-archetype-theme/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-theme/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/cdk/maven-archetype-theme/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -1,30 +1,30 @@ - - - - cdk - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.cdk - maven-archetype-theme - 3.3.1-SNAPSHOT - maven-archetype - maven-archetype-theme - - - - org.apache.maven.archetype - archetype-packaging - 2.0-alpha-4 - - - - - maven-archetype-plugin - 2.0-alpha-4 - true - - - - + + + + cdk + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.cdk + maven-archetype-theme + 3.3.1.CR2 + maven-archetype + maven-archetype-theme + + + + org.apache.maven.archetype + archetype-packaging + 2.0-alpha-4 + + + + + maven-archetype-plugin + 2.0-alpha-4 + true + + + + Modified: tags/3.3.1.CR2/cdk/maven-archetype-theme/src/main/resources/arche= type-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-archetype-theme/src/main/resources/archetype-resources/= pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-archetype-theme/src/main/resources/archetype-r= esources/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -10,7 +10,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -41,12 +41,12 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 = Modified: tags/3.3.1.CR2/cdk/maven-cdk-plugin/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-cdk-plugin/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-cdk-plugin/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,12 +2,12 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 maven-plugin Maven plugin for JSF components code generation @@ -55,7 +55,7 @@ org.richfaces.cdk generator - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/cdk/maven-javascript-plugin/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-javascript-plugin/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/cdk/maven-javascript-plugin/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -4,7 +4,7 @@ cdk org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-javascript-plugin Modified: tags/3.3.1.CR2/cdk/maven-resource-dependency-plugin/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-04 08:26:24 = UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-04 = 15:14:08 UTC (rev 14007) @@ -1,47 +1,46 @@ - - - cdk - org.richfaces - 3.3.1-SNAPSHOT - - = - 4.0.0 - = - org.richfaces.cdk - = - maven-resource-dependency-plugin - maven-plugin - 3.3.1-SNAPSHOT - maven-resource-dependency-plugin - = - = - - - - junit - junit - 3.8.1 - test - - - - commons-vfs - commons-vfs - 1.0 - - - = - commons-digester - commons-digester - 2.0 - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - = - - + + + cdk + org.richfaces + 3.3.1.CR2 + + = + 4.0.0 + = + org.richfaces.cdk + = + maven-resource-dependency-plugin + maven-plugin + 3.3.1.CR2 + maven-resource-dependency-plugin + = + = + + + + junit + junit + 3.8.1 + test + + + + commons-vfs + commons-vfs + 1.0 + + + = + commons-digester + commons-digester + 2.0 + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + = + + Modified: tags/3.3.1.CR2/cdk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/cdk/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,12 +2,12 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces cdk - 3.3.1-SNAPSHOT + 3.3.1.CR2 pom JSF Components Development kit Modified: tags/3.3.1.CR2/docs/cdkguide/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/cdkguide/en/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/cdkguide/en/pom.xml 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -5,12 +5,12 @@ org.richfaces.docs cdkguide - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../pom.xml org.richfaces.docs.cdkguide ${translation} - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar Richfaces CDK Developer Guide (${translation}) = Modified: tags/3.3.1.CR2/docs/cdkguide/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/cdkguide/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/cdkguide/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,13 +2,13 @@ docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs cdkguide pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 cdkguide Richfaces CDK Developer Guide @@ -119,11 +119,11 @@ org.apache.xmlgraphics fop 0.95 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.saxon - 9.1.0.1_1 + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.saxon + 9.1.0.1_1 = @@ -234,4 +234,4 @@ en = - + Modified: tags/3.3.1.CR2/docs/common-resources/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/common-resources/en/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/docs/common-resources/en/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,12 +2,12 @@ common-resources org.richfaces.docs - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs.common-resources en - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar Documentation common resources (en) @@ -17,7 +17,7 @@ org.richfaces.docs highlight - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richf= aces_archetype/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/common-resources/en/src/main/archetypes/richfaces_archetype/= pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_a= rchetype/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -4,7 +4,7 @@ richfacesguide-archetype maven-archetype richfacesguide-archetype - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richf= aces_archetype/src/main/resources/archetype-resources/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/common-resources/en/src/main/archetypes/richfaces_archetype/= src/main/resources/archetype-resources/en/pom.xml 2009-05-04 08:26:24 UTC (= rev 13996) +++ tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_a= rchetype/src/main/resources/archetype-resources/en/pom.xml 2009-05-04 15:14= :08 UTC (rev 14007) @@ -5,12 +5,12 @@ org.richfaces.docs richfacesguide - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../pom.xml org.richfaces.docs.richfacesguide ${translation} - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar Richfaces Guide Template = Modified: tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richf= aces_archetype/src/main/resources/archetype-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/common-resources/en/src/main/archetypes/richfaces_archetype/= src/main/resources/archetype-resources/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/docs/common-resources/en/src/main/archetypes/richfaces_a= rchetype/src/main/resources/archetype-resources/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,13 +2,13 @@ docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs richfacesguide pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 richfacesguide Richfaces Guide Template Modified: tags/3.3.1.CR2/docs/common-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/common-resources/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/common-resources/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,12 +2,12 @@ docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs common-resources - 3.3.1-SNAPSHOT + 3.3.1.CR2 pom Documentation common resources Common resources Modified: tags/3.3.1.CR2/docs/faq/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/faq/en/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/faq/en/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -5,12 +5,12 @@ org.richfaces.docs faq - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../pom.xml org.richfaces.docs.faq ${translation} - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar Richfaces Manual (${translation}) = @@ -52,4 +52,4 @@ --> - + Modified: tags/3.3.1.CR2/docs/faq/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/faq/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/faq/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,13 +2,13 @@ docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs faq pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 FAQ Frequently asked questions Modified: tags/3.3.1.CR2/docs/realworld_app_guide/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/docs/realworld_app_guide/en/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -5,12 +5,12 @@ org.richfaces.docs realworld - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../pom.xml org.richfaces.docs.realworld ${translation} - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar RichFaces Realworld application Guide (${translation}) = Modified: tags/3.3.1.CR2/docs/realworld_app_guide/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/docs/realworld_app_guide/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -1,16 +1,14 @@ - + docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs realworld pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 RichFaces Realworld application Guide RichFaces Migration Guide from 3.1.* to 3.2.0 version @@ -186,4 +184,4 @@ en = - + Modified: tags/3.3.1.CR2/docs/userguide/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/userguide/en/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/userguide/en/pom.xml 2009-05-04 15:14:08 UTC (rev 1= 4007) @@ -5,12 +5,12 @@ org.richfaces.docs userguide - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../pom.xml org.richfaces.docs.userguide ${translation} - 3.3.1-SNAPSHOT + 3.3.1.CR2 jar Richfaces Manual (${translation}) = Modified: tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCGett= ingStarted.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml = 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCGettingSta= rted.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -327,7 +327,7 @@ = Now you have everything to create the project u= sing the "maven-archetype-jsfwebapp" archetype. Create a folder t= hat will house your project and run the this command in it: = = = @@ -453,17 +453,17 @@ org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 ...]]> = Modified: tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCarch= itectover.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2= 009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/userguide/en/src/main/docbook/modules/RFCarchitecto= ver.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -3238,7 +3238,7 @@ archetypeVersion indicates the RichFaces version. For e= xample, - "3.3.1-SNAPSHOT" + "3.3.1.CR2" @@ -3482,7 +3482,7 @@ mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArtifactId=3Dmaven-archetype-plug-n-skin --DarchetypeVersion=3D3.3.1-SNAPSHOT +-DarchetypeVersion=3D3.3.1.CR2 -DartifactId=3DP-n-S -DgroupId=3DGROUPID -Dversion=3D1.0.-SNAPSHOT Modified: tags/3.3.1.CR2/docs/userguide/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/userguide/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/docs/userguide/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,13 +2,13 @@ docs org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.docs userguide pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 User guide RichFaces user guide Modified: tags/3.3.1.CR2/examples/photoalbum/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/examples/photoalbum/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -14,7 +14,7 @@ = photoalbum - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.1.1.GA 1.1.15.B1 ${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3= .GA Modified: tags/3.3.1.CR2/examples/photoalbum/source/ear/maven-build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ear/maven-build.xml 2009-05-04 08:26:2= 4 UTC (rev 13996) +++ tags/3.3.1.CR2/examples/photoalbum/source/ear/maven-build.xml 2009-05-0= 4 15:14:08 UTC (rev 14007) @@ -45,7 +45,7 @@ = - + @@ -56,7 +56,7 @@ - + @@ -144,7 +144,7 @@ - @@ -179,21 +179,21 @@ description=3D"Download all dependencies" = unless=3D"maven.mode.offline"> - - + - - - Modified: tags/3.3.1.CR2/examples/photoalbum/source/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/pom.xml 2009-05-04 08:26:24 UTC (rev 1= 3996) +++ tags/3.3.1.CR2/examples/photoalbum/source/pom.xml 2009-05-04 15:14:08 U= TC (rev 14007) @@ -14,7 +14,7 @@ = photoalbum - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.1.1.GA 1.1.15.B1 ${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3= .GA Modified: tags/3.3.1.CR2/examples/photoalbum/source/web/maven-build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/maven-build.xml 2009-05-04 08:26:2= 4 UTC (rev 13996) +++ tags/3.3.1.CR2/examples/photoalbum/source/web/maven-build.xml 2009-05-0= 4 15:14:08 UTC (rev 14007) @@ -71,11 +71,11 @@ - + - - + + @@ -107,11 +107,11 @@ - + - - + + @@ -249,9 +249,9 @@ todir=3D"${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib= "/> - - - - + - - - @@ -762,38 +762,38 @@ dest=3D"${maven.repo.local}/commons-beanutils/commons-beanutils/1= .7.0/commons-beanutils-1.7.0.jar" = usetimestamp=3D"false" = ignoreerrors=3D"true"/> - - + - - - - - + - - - Modified: tags/3.3.1.CR2/extensions/gwt/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/extensions/gwt/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/extensions/gwt/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -3,7 +3,7 @@ extensions org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces @@ -99,7 +99,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 com.sun.facelets Modified: tags/3.3.1.CR2/extensions/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/extensions/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/extensions/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,12 +2,12 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces extensions - 3.3.1-SNAPSHOT + 3.3.1.CR2 Richfaces extensions for a different environments pom Modified: tags/3.3.1.CR2/extensions/seam/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/extensions/seam/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/extensions/seam/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -35,7 +35,7 @@ org.richfaces ajax4jsf - 3.3.1-SNAPSHOT + 3.3.1.CR2 jboss Modified: tags/3.3.1.CR2/extensions/trinidad/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/extensions/trinidad/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/extensions/trinidad/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -35,7 +35,7 @@ org.richfaces ajax4jsf - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.apache.myfaces.trinidad Modified: tags/3.3.1.CR2/framework/api/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/api/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/api/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,13 +2,13 @@ framework org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.framework richfaces-api Java Server Faces AJAX framework API - 3.3.1-SNAPSHOT + 3.3.1.CR2 commons-collections Modified: tags/3.3.1.CR2/framework/impl/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/impl/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -1,15 +1,14 @@ - + framework org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.framework richfaces-impl Java Server Faces AJAX framework implementation - 3.3.1-SNAPSHOT + 3.3.1.CR2 @@ -161,7 +160,7 @@ org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/framework/impl/src/main/java/org/richfaces/Version= Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-= 05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/impl/src/main/java/org/richfaces/VersionBean.j= ava 2009-05-04 15:14:08 UTC (rev 14007) @@ -37,7 +37,7 @@ * Revision version, must be auto modified by CVS = */ = - public static final String REVISION =3D "1-SNAPSHOT" ; + public static final String REVISION =3D "1.CR2" ; public static final String SCM_REVISION =3D " SVN $Revision$ $Date$";//$R= evision$ $Date$"; public static final Version _version =3D new Version(); = Modified: tags/3.3.1.CR2/framework/jsf-test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/jsf-test/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/jsf-test/pom.xml 2009-05-04 15:14:08 UTC (rev = 14007) @@ -1,135 +1,134 @@ - - - - framework - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.framework - jsf-test - jsf-test - 3.3.1-SNAPSHOT - - - junit - junit - 4.5 - - - net.sourceforge.htmlunit - htmlunit - 2.4 - - - javax.faces - jsf-impl - 1.2_12 - provided - - - el-impl - el-impl - 1.0 - - - commons-httpclient - commons-httpclient - 3.1 - - - net.sourceforge.htmlunit - htmlunit-core-js - 2.4 - - - net.sourceforge.cssparser - cssparser - 0.9.5 - - - commons-io - commons-io - 1.4 - - - commons-lang - commons-lang - 2.4 - - - commons-collections - commons-collections - 3.2.1 - - - net.sourceforge.nekohtml - nekohtml - 1.9.11 - - - xml-apis - xml-apis - - - - - - javax.el - el-api - 1.0 - - - javax.servlet - servlet-api - 2.5 - - - javax.servlet.jsp - jsp-api - 2.1 - - - jstl - jstl - 1.2 - - - javax.faces - jsf-api - 1.2_12 - provided - - - javax.annotation - jsr250-api - 1.0 - - - xalan - xalan - 2.7.1 - - - xml-apis - xml-apis - - - - - de.berlios.jsunit - jsunit - 1.3 - - - rhino - js - - - - + + + + framework + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.framework + jsf-test + jsf-test + 3.3.1.CR2 + + + junit + junit + 4.5 + + + net.sourceforge.htmlunit + htmlunit + 2.4 + + + javax.faces + jsf-impl + 1.2_12 + provided + + + el-impl + el-impl + 1.0 + + + commons-httpclient + commons-httpclient + 3.1 + + + net.sourceforge.htmlunit + htmlunit-core-js + 2.4 + + + net.sourceforge.cssparser + cssparser + 0.9.5 + + + commons-io + commons-io + 1.4 + + + commons-lang + commons-lang + 2.4 + + + commons-collections + commons-collections + 3.2.1 + + + net.sourceforge.nekohtml + nekohtml + 1.9.11 + + + xml-apis + xml-apis + + + + + + javax.el + el-api + 1.0 + + + javax.servlet + servlet-api + 2.5 + + + javax.servlet.jsp + jsp-api + 2.1 + + + jstl + jstl + 1.2 + + + javax.faces + jsf-api + 1.2_12 + provided + + + javax.annotation + jsr250-api + 1.0 + + + xalan + xalan + 2.7.1 + + + xml-apis + xml-apis + + + + + de.berlios.jsunit + jsunit + 1.3 + + + rhino + js + + + + \ No newline at end of file Modified: tags/3.3.1.CR2/framework/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,12 +2,12 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces framework - 3.3.1-SNAPSHOT + 3.3.1.CR2 pom Java Server Faces AJAX framework Modified: tags/3.3.1.CR2/framework/test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/test/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/framework/test/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,12 +2,12 @@ framework org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.framework richfaces-test - 3.3.1-SNAPSHOT + 3.3.1.CR2 Ajax4Jsf test framework https://ajax4jsf.dev.java.net @@ -42,7 +42,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 javax.faces Modified: tags/3.3.1.CR2/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -4,7 +4,7 @@ root pom Jboss RichFaces project - 3.3.1-SNAPSHOT + 3.3.1.CR2 http://labs.jboss.com/jbossrichfaces @@ -217,9 +217,9 @@ - scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk - scm:svn:https://svn.jboss.org/repos/richfaces/trunk= - https://svn.jboss.org/repos/richfaces/trunk + scm:svn:https://svn.jboss.org/repos/richfaces/tags/3.3.1.CR2= + scm:svn:https://svn.jboss.org/repos/richfaces/branc= hes/3.3.1.CR2 + https://svn.jboss.org/repos/richfaces/branches/3.3.1.CR2 @@ -242,9 +242,9 @@ .settings/org.eclipse.jdt.ui.prefs - /**\= r\n * License Agreement.\r\n *\r\n * JBoss RichFaces - Ajax4jsf Component = Library\r\n *\r\n * Copyright (C) 2007 Exadel, Inc.\r\n *\r\n * This libra= ry is free software; you can redistribute it and/o! r\r\n * modify it under the terms of the GNU Lesser General Public\r\n * L= icense version 2.1 as published by the Free Software Foundation.\r\n *\r\n = * This library is distributed in the hope that it will be useful,\r\n * but= WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTA= BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r\n * Lesser Gener= al Public License for more details.\r\n *\r\n * You should have received a = copy of the GNU Lesser General Public\r\n * License along with this library= ; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin St= reet, Fifth Floor, Boston, MA 02110-1301 USA\r\n */\r\n + /**\= r\n * License Agreement.\r\n *\r\n * JBoss RichFaces - Ajax4jsf Component = Library\r\n *\r\n * Copyright (C) 2007 Exadel, Inc.\r\n *\r\n * This libra= ry is free software; you can redistribute it and/o! r\r\n * modify it under the terms of the GNU Lesser General Public\r\n * L= icense version 2.1 as published by the Free Software Foundation.\r\n *\r\n = * This library is distributed in the hope that it will be useful,\r\n * but= WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTA= BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r\n * Lesser Gener= al Public License for more details.\r\n *\r\n * You should have received a = copy of the GNU Lesser General Public\r\n * License along with this library= ; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin St= reet, Fifth Floor, Boston, MA 02110-1301 USA\r\n */\r\n ]]> Modified: tags/3.3.1.CR2/samples/beanValidatorSample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/beanValidatorSample/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/beanValidatorSample/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -3,14 +3,14 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples beanValidatorSample war beanValidatorSample Maven Webapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 richfaces-validator @@ -52,7 +52,7 @@ org.hibernate @@ -75,7 +75,7 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 com.uwyn Modified: tags/3.3.1.CR2/samples/calendar-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/calendar-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/calendar-sample/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/colorPickerDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/colorPickerDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/colorPickerDemo/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples @@ -35,7 +35,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.samples @@ -46,17 +46,17 @@ org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui dataTable - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui colorPicker - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/samples/columnsDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/columnsDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/columnsDemo/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/combobox-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/combobox-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/combobox-sample/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/contextMenuDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/contextMenuDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/contextMenuDemo/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/createProject.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/createProject.sh 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/createProject.sh 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsfwebapp \ - -DarchetypeVersion=3D3.3.1-SNAPSHOT -Dversion=3D3.3.1-SNAPSHOT -D= groupId=3Dorg.richfaces.samples -DartifactId=3D$1 + -DarchetypeVersion=3D3.3.1.CR2 -Dversion=3D3.3.1.CR2 -DgroupId=3D= org.richfaces.samples -DartifactId=3D$1 Modified: tags/3.3.1.CR2/samples/darkX/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/darkX/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/darkX/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,48 +1,48 @@ - - - samples - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.samples - darkX - darkX - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - - junit - junit - 3.8.1 - test - - + + + samples + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.samples + darkX + darkX + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + + + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + + junit + junit + 3.8.1 + test + + \ No newline at end of file Modified: tags/3.3.1.CR2/samples/dataFilterSliderDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/dataFilterSliderDemo/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/samples/dataFilterSliderDemo/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/dataTableDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/dataTableDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/dataTableDemo/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/datascroller-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/datascroller-sample/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/datascroller-sample/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/dragDropDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/dragDropDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/dragDropDemo/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/dropdownmenu-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/dropdownmenu-sample/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/dropdownmenu-sample/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/editor-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/editor-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/editor-sample/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/samples/editorSeam-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/editorSeam-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/samples/editorSeam-sample/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -5,7 +5,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/samples/effect-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/effect-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/effect-sample/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/extendedDataTable-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/extendedDataTable-sample/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/samples/extendedDataTable-sample/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces Modified: tags/3.3.1.CR2/samples/fileUploadDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/fileUploadDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/fileUploadDemo/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/functions-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/functions-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/functions-demo/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/glassX/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/glassX/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/glassX/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -1,49 +1,49 @@ - - - samples - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.samples - glassX - glassX - 3.3.1-SNAPSHOT - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - - junit - junit - 3.8.1 - test - - + + + samples + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.samples + glassX + glassX + 3.3.1.CR2 + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + + + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + + junit + junit + 3.8.1 + test + + \ No newline at end of file Modified: tags/3.3.1.CR2/samples/gmap-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/gmap-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/gmap-sample/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/hotKey-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/hotKey-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/hotKey-sample/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces Modified: tags/3.3.1.CR2/samples/inplaceInput-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/inplaceInput-sample/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/inplaceInput-sample/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/inplaceSelect-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/inplaceSelect-sample/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/samples/inplaceSelect-sample/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/inputNumberSliderDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/inputNumberSliderDemo/pom.xml 2009-05-04 08:26:24 UTC (re= v 13996) +++ tags/3.3.1.CR2/samples/inputNumberSliderDemo/pom.xml 2009-05-04 15:14:0= 8 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/inputNumberSpinnerDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/inputNumberSpinnerDemo/pom.xml 2009-05-04 08:26:24 UTC (r= ev 13996) +++ tags/3.3.1.CR2/samples/inputNumberSpinnerDemo/pom.xml 2009-05-04 15:14:= 08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/jQuery-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/jQuery-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/jQuery-sample/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/jira-data/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/jira-data/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/jira-data/pom.xml 2009-05-04 15:14:08 UTC (rev 1= 4007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/laguna/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/laguna/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/laguna/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -4,7 +4,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.samples @@ -16,7 +16,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.laguna Modified: tags/3.3.1.CR2/samples/layout-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/layout-sample/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -4,14 +4,14 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples layout-sample war layout Maven Webapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 layout-sample @@ -34,22 +34,22 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.samples skins - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.samples themes - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui Modified: tags/3.3.1.CR2/samples/listShuttleDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/listShuttleDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/listShuttleDemo/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/local-value-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/local-value-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/samples/local-value-demo/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/modalpanel-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/modalpanel-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/samples/modalpanel-sample/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/orderingListDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/orderingListDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/samples/orderingListDemo/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/panel-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/panel-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/panel-sample/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/panelbar-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/panelbar-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/panelbar-sample/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/panelmenu-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/panelmenu-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/samples/panelmenu-sample/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/pickList-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/pickList-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/pickList-sample/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,502 +1,502 @@ - - - - root - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces - samples - pom - RichFaces Components Examples - http://labs.jboss.com/jbossrichfaces/samples - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - - 6.1.5 - - 10 - - - 8080 - 60000 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - surefire-it - integration-test - - test - - - false - - - - - - - - - - junit - junit - 3.8.1 - test - - - org.richfaces.framework - richfaces-impl - ${project.version} - - - com.sun.facelets - jsf-facelets - 1.1.14 - - - javax.servlet - jstl - 1.0 - runtime - - - nekohtml - nekohtml - 0.9.5 - runtime - - - xerces - xerces - - - - - - - jsf1_1 - - false - - jsfVersion - 1.1 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - - - - javax.el - el-api - 1.0 - - - el-impl - el-impl - 1.0 - - - javax.servlet - servlet-api - 2.4 - provided - - - javax.servlet - jsp-api - 2.0 - provided - - - javax.servlet - jstl - 1.0 - - - - - jsf1_2 - - false - - jsfVersion - 1.2 - - - - jetty:run - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.faces - jsf-api - 1.2_12 - - - javax.faces - jsf-impl - 1.2_12 - runtime - - - - - tomcat5 - - false - - - jetty:run - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - javax.el - el-api - 1.0 - - - el-impl - el-impl - 1.0 - - - javax.servlet - servlet-api - 2.4 - provided - - - javax.servlet.jsp - jsp-api - 2.0 - provided - - - javax.faces - jsf-api - 1.2_12 - - - javax.faces - jsf-impl - 1.2_12 - runtime - - - - - tomcat6 - - true - - - jetty:run - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.faces - jsf-api - 1.2_12 - - - javax.faces - jsf-impl - 1.2_12 - runtime - - - javax.el - el-api - 1.0 - provided - - - el-impl - el-impl - 1.0 - provided - - - - - jboss42 - - jetty:run - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - javax.servlet - servlet-api - 2.4 - provided - - - javax.servlet.jsp - jsp-api - 2.0 - provided - - - javax.faces - jsf-impl - 1.2_12 - provided - - - javax.faces - jsf-api - 1.2_12 - provided - - - - - myfaces - - 1.2.5 - 1.1.7 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - org.richfaces.framework - richfaces-impl - ${project.version} - - - javax.faces - jsf-api - - - javax.faces - jsf-impl - - - - - org.apache.myfaces.core - myfaces-api - ${myfaces} - - - org.apache.myfaces.core - myfaces-impl - ${myfaces} - runtime - - - - - seam - - seamEAR - seamIntegration - - - - clover - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - - false - - - false - - 1.5 - - **/*.java - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - - - allSamples - - separator-sample - panel-sample - gmap-sample - togglePanel-sample - tabPanelDemo - simpleTogglePanel-sample - inputNumberSpinnerDemo - inputNumberSliderDemo - panelbar-sample - toolBarDemo - tree-demo - dataFilterSliderDemo - suggestionbox-sample - dragDropDemo - dataTableDemo - modalpanel-sample - datascroller-sample - effect-sample - dropdownmenu-sample - tooltip-sample - calendar-sample - treeModelDemo - local-value-demo - panelmenu-sample - rich-message-demo - scrollableDataTableDemo - richfaces-ear-demo - contextMenuDemo - orderingListDemo - listShuttleDemo - columnsDemo - combobox-sample - pickList-sample - progressBarDemo - jira-data - stdcomponents-sample - fileUploadDemo - sortingFilteringDemo - inplaceInput-sample - inplaceSelect-sample - functions-demo - hotKey-sample - beanValidatorSample - state-sample - extendedDataTable-sample - queue-sample - editor-sample - editorSeam-sample - colorPickerDemo - layout-sample - - - - - skins - laguna - glassX - darkX - richfaces-demo - themes - + + + + root + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces + samples + pom + RichFaces Components Examples + http://labs.jboss.com/jbossrichfaces/samples + + + + + + + + org.mortbay.jetty + maven-jetty-plugin + + 6.1.5 + + 10 + + + 8080 + 60000 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + surefire-it + integration-test + + test + + + false + + + + + + + + + + junit + junit + 3.8.1 + test + + + org.richfaces.framework + richfaces-impl + ${project.version} + + + com.sun.facelets + jsf-facelets + 1.1.14 + + + javax.servlet + jstl + 1.0 + runtime + + + nekohtml + nekohtml + 0.9.5 + runtime + + + xerces + xerces + + + + + + + jsf1_1 + + false + + jsfVersion + 1.1 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + + + + + + javax.el + el-api + 1.0 + + + el-impl + el-impl + 1.0 + + + javax.servlet + servlet-api + 2.4 + provided + + + javax.servlet + jsp-api + 2.0 + provided + + + javax.servlet + jstl + 1.0 + + + + + jsf1_2 + + false + + jsfVersion + 1.2 + + + + jetty:run + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.faces + jsf-api + 1.2_12 + + + javax.faces + jsf-impl + 1.2_12 + runtime + + + + + tomcat5 + + false + + + jetty:run + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + javax.el + el-api + 1.0 + + + el-impl + el-impl + 1.0 + + + javax.servlet + servlet-api + 2.4 + provided + + + javax.servlet.jsp + jsp-api + 2.0 + provided + + + javax.faces + jsf-api + 1.2_12 + + + javax.faces + jsf-impl + 1.2_12 + runtime + + + + + tomcat6 + + true + + + jetty:run + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.faces + jsf-api + 1.2_12 + + + javax.faces + jsf-impl + 1.2_12 + runtime + + + javax.el + el-api + 1.0 + provided + + + el-impl + el-impl + 1.0 + provided + + + + + jboss42 + + jetty:run + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + javax.servlet + servlet-api + 2.4 + provided + + + javax.servlet.jsp + jsp-api + 2.0 + provided + + + javax.faces + jsf-impl + 1.2_12 + provided + + + javax.faces + jsf-api + 1.2_12 + provided + + + + + myfaces + + 1.2.5 + 1.1.7 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + org.richfaces.framework + richfaces-impl + ${project.version} + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + + + + org.apache.myfaces.core + myfaces-api + ${myfaces} + + + org.apache.myfaces.core + myfaces-impl + ${myfaces} + runtime + + + + + seam + + seamEAR + seamIntegration + + + + clover + + + + com.atlassian.maven.plugins + maven-clover2-plugin + + + false + + + false + + 1.5 + + **/*.java + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + + 1.5 + 1.5 + + + + + + + allSamples + + separator-sample + panel-sample + gmap-sample + togglePanel-sample + tabPanelDemo + simpleTogglePanel-sample + inputNumberSpinnerDemo + inputNumberSliderDemo + panelbar-sample + toolBarDemo + tree-demo + dataFilterSliderDemo + suggestionbox-sample + dragDropDemo + dataTableDemo + modalpanel-sample + datascroller-sample + effect-sample + dropdownmenu-sample + tooltip-sample + calendar-sample + treeModelDemo + local-value-demo + panelmenu-sample + rich-message-demo + scrollableDataTableDemo + richfaces-ear-demo + contextMenuDemo + orderingListDemo + listShuttleDemo + columnsDemo + combobox-sample + pickList-sample + progressBarDemo + jira-data + stdcomponents-sample + fileUploadDemo + sortingFilteringDemo + inplaceInput-sample + inplaceSelect-sample + functions-demo + hotKey-sample + beanValidatorSample + state-sample + extendedDataTable-sample + queue-sample + editor-sample + editorSeam-sample + colorPickerDemo + layout-sample + + + + + skins + laguna + glassX + darkX + richfaces-demo + themes + \ No newline at end of file Modified: tags/3.3.1.CR2/samples/progressBarDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/progressBarDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/progressBarDemo/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/queue-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/queue-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/queue-sample/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,14 +2,14 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces queue-sample war queue-sample Maven Webapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 queue-sample Modified: tags/3.3.1.CR2/samples/rich-message-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/rich-message-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/samples/rich-message-demo/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/richfaces-art-datatable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-art-datatable/pom.xml 2009-05-04 08:26:24 UTC (= rev 13996) +++ tags/3.3.1.CR2/samples/richfaces-art-datatable/pom.xml 2009-05-04 15:14= :08 UTC (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/richfaces-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/richfaces-demo/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 @@ -209,22 +209,22 @@ org.richfaces.samples laguna - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.samples glassX - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.samples darkX - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 com.uwyn @@ -314,7 +314,7 @@ org.richfaces.samples themes - 3.3.1-SNAPSHOT + 3.3.1.CR2 = javax.persistence Modified: tags/3.3.1.CR2/samples/richfaces-ear-demo/ejb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-ear-demo/ejb/pom.xml 2009-05-04 08:26:24 UTC (r= ev 13996) +++ tags/3.3.1.CR2/samples/richfaces-ear-demo/ejb/pom.xml 2009-05-04 15:14:= 08 UTC (rev 14007) @@ -2,7 +2,7 @@ richfaces-ear-demo org.richfaces.samples - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples.richfaces-ear-demo Modified: tags/3.3.1.CR2/samples/richfaces-ear-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-ear-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 1= 3996) +++ tags/3.3.1.CR2/samples/richfaces-ear-demo/pom.xml 2009-05-04 15:14:08 U= TC (rev 14007) @@ -2,7 +2,7 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/richfaces-ear-demo/richfacesEAR/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-05-04 08:26:= 24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-05-= 04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ richfaces-ear-demo org.richfaces.samples - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples.richfaces-ear-demo Modified: tags/3.3.1.CR2/samples/richfaces-ear-demo/webapp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-ear-demo/webapp/pom.xml 2009-05-04 08:26:24 UTC= (rev 13996) +++ tags/3.3.1.CR2/samples/richfaces-ear-demo/webapp/pom.xml 2009-05-04 15:= 14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ richfaces-ear-demo org.richfaces.samples - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples.richfaces-ear-demo Modified: tags/3.3.1.CR2/samples/scrollableDataTableDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/scrollableDataTableDemo/pom.xml 2009-05-04 08:26:24 UTC (= rev 13996) +++ tags/3.3.1.CR2/samples/scrollableDataTableDemo/pom.xml 2009-05-04 15:14= :08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 scrollableDataTableDemo Modified: tags/3.3.1.CR2/samples/seamEAR/ear/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/ear/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/ear/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -7,7 +7,7 @@ org.richfaces.samples seamEAR - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/samples/seamEAR/ejbs/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/ejbs/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/ejbs/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -7,7 +7,7 @@ org.richfaces.samples seamEAR - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/samples/seamEAR/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -2,7 +2,7 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/seamEAR/primary-source/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/primary-source/pom.xml 2009-05-04 08:26:24 UTC (r= ev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/primary-source/pom.xml 2009-05-04 15:14:= 08 UTC (rev 14007) @@ -7,7 +7,7 @@ org.richfaces.samples seamEAR - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/samples/seamEAR/projects/logging/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/projects/logging/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/projects/logging/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -7,6 +7,6 @@ org.richfaces.samples.seamEAR projects - 3.3.1-SNAPSHOT + 3.3.1.CR2 Modified: tags/3.3.1.CR2/samples/seamEAR/projects/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/projects/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/samples/seamEAR/projects/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -7,7 +7,7 @@ org.richfaces.samples seamEAR - 3.3.1-SNAPSHOT + 3.3.1.CR2 logging Modified: tags/3.3.1.CR2/samples/seamEAR/wars/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/wars/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/wars/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -7,7 +7,7 @@ org.richfaces.samples seamEAR - 3.3.1-SNAPSHOT + 3.3.1.CR2 seamWebapp Modified: tags/3.3.1.CR2/samples/seamEAR/wars/seamWebapp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2009-05-04 08:26:24 UTC (= rev 13996) +++ tags/3.3.1.CR2/samples/seamEAR/wars/seamWebapp/pom.xml 2009-05-04 15:14= :08 UTC (rev 14007) @@ -7,7 +7,7 @@ org.richfaces.samples.seamEAR wars - 3.3.1-SNAPSHOT + 3.3.1.CR2 seamWebapp @@ -22,17 +22,17 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 provided Modified: tags/3.3.1.CR2/samples/seamIntegration/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/seamIntegration/pom.xml 2009-05-04 08:26:24 UTC (rev 1399= 6) +++ tags/3.3.1.CR2/samples/seamIntegration/pom.xml 2009-05-04 15:14:08 UTC = (rev 14007) @@ -5,7 +5,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/separator-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/separator-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/samples/separator-sample/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/simpleTogglePanel-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/simpleTogglePanel-sample/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/samples/simpleTogglePanel-sample/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/skins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/skins/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/skins/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/sortingFilteringDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/sortingFilteringDemo/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/samples/sortingFilteringDemo/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples @@ -16,7 +16,7 @@ = Modified: tags/3.3.1.CR2/samples/state-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/state-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/state-sample/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces @@ -16,17 +16,17 @@ org.richfaces.ui state - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.samples skins - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/samples/stdcomponents-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/stdcomponents-sample/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/samples/stdcomponents-sample/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/suggestionbox-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/suggestionbox-sample/pom.xml 2009-05-04 08:26:24 UTC (rev= 13996) +++ tags/3.3.1.CR2/samples/suggestionbox-sample/pom.xml 2009-05-04 15:14:08= UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/tabPanelDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/tabPanelDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/tabPanelDemo/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/themes/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/themes/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -1,44 +1,44 @@ - - - 4.0.0 - - samples - org.richfaces - 3.3.1-SNAPSHOT - - org.richfaces.samples - themes - 3.3.1-SNAPSHOT - themes - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - generate-sources - - generate - - - - - - - - - junit - junit - 3.8.1 - test - - - org.richfaces.ui - layout - 3.3.1-SNAPSHOT - - + + + 4.0.0 + + samples + org.richfaces + 3.3.1.CR2 + + org.richfaces.samples + themes + 3.3.1.CR2 + themes + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + generate-sources + + generate + + + + + + + + + junit + junit + 3.8.1 + test + + + org.richfaces.ui + layout + 3.3.1.CR2 + + \ No newline at end of file Modified: tags/3.3.1.CR2/samples/togglePanel-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/togglePanel-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 1= 3996) +++ tags/3.3.1.CR2/samples/togglePanel-sample/pom.xml 2009-05-04 15:14:08 U= TC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/tomahawkCompability/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/tomahawkCompability/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/tomahawkCompability/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/toolBarDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/toolBarDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/toolBarDemo/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/tooltip-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/tooltip-sample/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/tooltip-sample/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -3,7 +3,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/tree-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/tree-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/tree-demo/pom.xml 2009-05-04 15:14:08 UTC (rev 1= 4007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/treeModelDemo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/treeModelDemo/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/samples/treeModelDemo/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/samples/virtualEarth-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/virtualEarth-sample/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/samples/virtualEarth-sample/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -4,7 +4,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples Modified: tags/3.3.1.CR2/sandbox/api/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/api/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/api/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,13 +2,13 @@ sandbox org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox richfaces-sandbox-api Richfaces Sandbox API = - 3.3.1-SNAPSHOT + 3.3.1.CR2 @@ -25,12 +25,12 @@ org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 javax.faces Modified: tags/3.3.1.CR2/sandbox/cdk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/cdk/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/cdk/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,12 +2,12 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox cdk - 3.3.1-SNAPSHOT + 3.3.1.CR2 pom JSF Components Development kit Modified: tags/3.3.1.CR2/sandbox/impl/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/impl/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/impl/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,28 +2,28 @@ sandbox org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox richfaces-sandbox-impl Richfaces Sandbox Implementation = - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.sandbox richfaces-sandbox-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-test - 3.3.1-SNAPSHOT + 3.3.1.CR2 javax.faces Modified: tags/3.3.1.CR2/sandbox/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces Modified: tags/3.3.1.CR2/sandbox/samples/dialog-window-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/dialog-window-sample/pom.xml 2009-05-04 08:26:24 = UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/samples/dialog-window-sample/pom.xml 2009-05-04 = 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/sandbox/samples/editorOld-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/editorOld-sample/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/sandbox/samples/editorOld-sample/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/sandbox/samples/fileUploadPOC/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/fileUploadPOC/pom.xml 2009-05-04 08:26:24 UTC (re= v 13996) +++ tags/3.3.1.CR2/sandbox/samples/fileUploadPOC/pom.xml 2009-05-04 15:14:0= 8 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces Modified: tags/3.3.1.CR2/sandbox/samples/maven-rd-plugin-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-04 08:26:2= 4 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-0= 4 15:14:08 UTC (rev 14007) @@ -2,14 +2,14 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.cdk.sandbox maven-rd-plugin-sample war maven-rd-plugin-sample Maven Webapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 maven-rd-plugin-sample @@ -23,7 +23,7 @@ maven-resource-dependency-plugin org.richfaces.cdk - 3.3.1-SNAPSHOT + 3.3.1.CR2 ${basedir}/src/main/webapp = @@ -72,7 +72,7 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/samples/panel2-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/panel2-sample/pom.xml 2009-05-04 08:26:24 UTC (re= v 13996) +++ tags/3.3.1.CR2/sandbox/samples/panel2-sample/pom.xml 2009-05-04 15:14:0= 8 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/sandbox/samples/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/samples/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -3,7 +3,7 @@ org.richfaces samples - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/sandbox/samples/rex-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/rex-demo/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/sandbox/samples/rex-demo/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.samples @@ -178,7 +178,7 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 com.uwyn @@ -193,28 +193,28 @@ org.richfaces.sandbox.ui rex-resizable - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.sandbox.ui rex-button - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.sandbox.ui rex-messageBox - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui componentControl - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.sandbox richfaces-sandbox-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 = = Modified: tags/3.3.1.CR2/sandbox/samples/simpleTogglePanel2-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-05-04 08:2= 6:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-0= 5-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ samples org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces Modified: tags/3.3.1.CR2/sandbox/ui/create.bat =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/create.bat 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/create.bat 2009-05-04 15:14:08 UTC (rev 14007) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1-SNAPSHOT= -DgroupId=3Dorg.richfaces.ui -DartifactId=3D%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1.CR2 -Dgr= oupId=3Dorg.richfaces.ui -DartifactId=3D%1 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/create.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/create.sh 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/create.sh 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,2 +1,2 @@ #!/bin/sh -mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1-SNAPSHOT= -DgroupId=3Dorg.richfaces.ui -DartifactId=3D${1} \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1.CR2 -Dgr= oupId=3Dorg.richfaces.ui -DartifactId=3D${1} \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/dialog-window/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/dialog-window/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/sandbox/ui/dialog-window/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -39,12 +39,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 provided Modified: tags/3.3.1.CR2/sandbox/ui/editorOld/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/editorOld/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/editorOld/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/panel2/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/panel2/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/panel2/pom.xml 2009-05-04 15:14:08 UTC (rev 1= 4007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -3,7 +3,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox Modified: tags/3.3.1.CR2/sandbox/ui/rex-button/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/rex-button/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/rex-button/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -43,7 +43,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/rex-messageBox/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/rex-messageBox/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/sandbox/ui/rex-messageBox/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -43,7 +43,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/rex-resizable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/rex-resizable/pom.xml 2009-05-04 08:26:24 UTC (rev 139= 96) +++ tags/3.3.1.CR2/sandbox/ui/rex-resizable/pom.xml 2009-05-04 15:14:08 UTC= (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/sandbox/ui/simpleTogglePanel2/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/simpleTogglePanel2/pom.xml 2009-05-04 08:26:24 UTC (re= v 13996) +++ tags/3.3.1.CR2/sandbox/ui/simpleTogglePanel2/pom.xml 2009-05-04 15:14:0= 8 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/sortableHeader/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/sortableHeader/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/sandbox/ui/sortableHeader/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces.sandbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox.ui sortableHeader sortableHeader - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -52,17 +52,17 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui dataTable - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/sandbox/ui/treeTable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/ui/treeTable/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/sandbox/ui/treeTable/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.sandbox treeTable treeTable - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/test-applications/ajaxTest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/ajaxTest/pom.xml 2009-05-04 08:26:24 UTC (rev 1= 3996) +++ tags/3.3.1.CR2/test-applications/ajaxTest/pom.xml 2009-05-04 15:14:08 U= TC (rev 14007) @@ -55,7 +55,7 @@ org.richfaces.framework jsf-test - 3.3.1-SNAPSHOT + 3.3.1.CR2 test @@ -66,7 +66,7 @@ org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 javax.el Modified: tags/3.3.1.CR2/test-applications/automator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/automator/pom.xml 2009-05-04 08:26:24 UTC (rev = 13996) +++ tags/3.3.1.CR2/test-applications/automator/pom.xml 2009-05-04 15:14:08 = UTC (rev 14007) @@ -2,7 +2,7 @@ test-applications org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/test-applications/facelets/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/facelets/pom.xml 2009-05-04 08:26:24 UTC (rev 1= 3996) +++ tags/3.3.1.CR2/test-applications/facelets/pom.xml 2009-05-04 15:14:08 U= TC (rev 14007) @@ -2,7 +2,7 @@ test-applications org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/test-applications/jsp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/jsp/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/jsp/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ test-applications org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 = 4.0.0 Modified: tags/3.3.1.CR2/test-applications/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/pom.xml 2009-05-04 15:14:08 UTC (rev 1= 4007) @@ -2,7 +2,7 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 ../samples = @@ -50,11 +50,11 @@ org.richfaces test-applications pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 RichFaces Test Applications = - 3.3.1-SNAPSHOT + 3.3.1.CR2 = Modified: tags/3.3.1.CR2/test-applications/regressionArea/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/test-applications/regressionArea/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -4,12 +4,12 @@ org.richfaces.test-applications regressionArea pom - 3.3.1-SNAPSHOT + 3.3.1.CR2 Regresion Area:Seam Application @@ -60,7 +60,7 @@ regressionArea regressionArea-ear - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.1.1.GA 1.2_11 C:/tmp/jboss-4.2.3.GA Modified: tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ea= r/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-= 05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ear/pom.= xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -6,9 +6,9 @@ org.richfaces.test-applications regressionArea - 3.3.1-SNAPSHOT + 3.3.1.CR2 - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.test-applications.regressionArea regressionArea-ear Regression Area Ear Module Modified: tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ej= b/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-= 05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-ejb/pom.= xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -4,7 +4,7 @@ org.richfaces.test-applications regressionArea - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.test-applications.regressionArea regressionArea-ejb Modified: tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-te= sts/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/regressionArea-tests/pom.xml 200= 9-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-tests/po= m.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ regressionArea org.richfaces.test-applications - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.test-applications.regressionArea Modified: tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-we= b/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-= 05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/regressionArea/regressionArea-web/pom.= xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -4,7 +4,7 @@ org.richfaces.test-applications regressionArea - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.test-applications.regressionArea regressionArea-web Modified: tags/3.3.1.CR2/test-applications/richfaces-docs/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/richfaces-docs/pom.xml 2009-05-04 08:26:24 UTC = (rev 13996) +++ tags/3.3.1.CR2/test-applications/richfaces-docs/pom.xml 2009-05-04 15:1= 4:08 UTC (rev 14007) @@ -8,7 +8,7 @@ richfaces-docs richfaces-docs - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.0.1.GA = 4.0.0 Modified: tags/3.3.1.CR2/test-applications/richfaces-docs/web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/richfaces-docs/web/pom.xml 2009-05-04 08:26:24 = UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/richfaces-docs/web/pom.xml 2009-05-04 = 15:14:08 UTC (rev 14007) @@ -47,7 +47,7 @@ = org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 provided = Modified: tags/3.3.1.CR2/test-applications/seamApp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seamApp/pom.xml 2009-05-04 08:26:24 UTC (rev 13= 996) +++ tags/3.3.1.CR2/test-applications/seamApp/pom.xml 2009-05-04 15:14:08 UT= C (rev 14007) @@ -8,7 +8,7 @@ sample application seamApp - 3.3.1-SNAPSHOT + 3.3.1.CR2 2.1.0.SP1 http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.= zip jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/ Modified: tags/3.3.1.CR2/test-applications/seleniumTest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/pom.xml 2009-05-04 08:26:24 UTC (r= ev 13996) +++ tags/3.3.1.CR2/test-applications/seleniumTest/pom.xml 2009-05-04 15:14:= 08 UTC (rev 14007) @@ -5,14 +5,14 @@ samples org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 seleniumTest seleniumTest pom SeleniumTest - 3.3.1-SNAPSHOT + 3.3.1.CR2 http://maven.apache.org 8085 @@ -227,7 +227,7 @@ org.richfaces.ui richfaces-ui - 3.3.1-SNAPSHOT + 3.3.1.CR2 javax.faces Modified: tags/3.3.1.CR2/test-applications/seleniumTest/richfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/richfaces/pom.xml 2009-05-04 08:26= :24 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/seleniumTest/richfaces/pom.xml 2009-05= -04 15:14:08 UTC (rev 14007) @@ -5,14 +5,14 @@ seleniumTest seleniumTest - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 seleniumTest richfaces war seleniumTest Maven Webapp - 3.3.1-SNAPSHOT + 3.3.1.CR2 richfaces Modified: tags/3.3.1.CR2/test-applications/seleniumTest/samples/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-applications/seleniumTest/samples/pom.xml 2009-05-04 08:26:2= 4 UTC (rev 13996) +++ tags/3.3.1.CR2/test-applications/seleniumTest/samples/pom.xml 2009-05-0= 4 15:14:08 UTC (rev 14007) @@ -5,13 +5,13 @@ seleniumTest seleniumTest - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 seleniumTest samples Samples - 3.3.1-SNAPSHOT + 3.3.1.CR2 seleniumTest Modified: tags/3.3.1.CR2/ui/assembly/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/assembly/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/assembly/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -15,7 +15,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces Modified: tags/3.3.1.CR2/ui/beanValidator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/beanValidator/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/beanValidator/pom.xml 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -1,81 +1,81 @@ - - - - ui - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.ui - beanValidator - beanValidator - 3.3.1-SNAPSHOT - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - - - org.richfaces.ui - - beanValidator - - - - - - - - - junit - junit - 3.8.1 - test - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - - org.richfaces.ui - message - 3.3.1-SNAPSHOT - - - org.hibernate - hibernate-validator - 3.1.0.GA - - - - true - - - javax.validation - validation-api - 1.0.CR2 - - - org.slf4j - slf4j-simple - 1.4.2 - test - - + + + + ui + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.ui + beanValidator + beanValidator + 3.3.1.CR2 + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + + + org.richfaces.ui + + beanValidator + + + + + + + + + junit + junit + 3.8.1 + test + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + + org.richfaces.ui + message + 3.3.1.CR2 + + + org.hibernate + hibernate-validator + 3.1.0.GA + + + + true + + + javax.validation + validation-api + 1.0.CR2 + + + org.slf4j + slf4j-simple + 1.4.2 + test + + \ No newline at end of file Modified: tags/3.3.1.CR2/ui/calendar/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/calendar/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/calendar/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,13 +45,13 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.ui inputnumber-spinner - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/colorPicker/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/colorPicker/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/colorPicker/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -1,55 +1,55 @@ - - - ui - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.ui - colorPicker - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - generate-test-sources - generate-test-sources - - generate-tests - - - - - - org.richfaces.ui - - colorPicker - - - - - - - - - junit - junit - 3.8.1 - test - - - org.richfaces.framework - richfaces-impl - ${project.version} - - - + + + ui + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.ui + colorPicker + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + generate-test-sources + generate-test-sources + + generate-tests + + + + + + org.richfaces.ui + + colorPicker + + + + + + + + + junit + junit + 3.8.1 + test + + + org.richfaces.framework + richfaces-impl + ${project.version} + + + Modified: tags/3.3.1.CR2/ui/columns/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/columns/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/columns/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui Modified: tags/3.3.1.CR2/ui/combobox/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/combobox/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/combobox/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui combobox combobox - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -51,12 +51,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui suggestionbox - 3.3.1-SNAPSHOT + 3.3.1.CR2 = Modified: tags/3.3.1.CR2/ui/componentControl/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/componentControl/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/componentControl/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -50,7 +50,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/contextMenu/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/contextMenu/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/contextMenu/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui contextMenu contextMenu - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -51,12 +51,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui menu-components - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/core/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/core/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/create.bat =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/create.bat 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/create.bat 2009-05-04 15:14:08 UTC (rev 14007) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1-SNAPSHOT= -DgroupId=3Dorg.richfaces -DartifactId=3D%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=3Dorg.richfaces.cdk -DarchetypeArt= ifactId=3Dmaven-archetype-jsf-component -DarchetypeVersion=3D3.3.1.CR2 -Dgr= oupId=3Dorg.richfaces -DartifactId=3D%1 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/dataFilterSlider/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/dataFilterSlider/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/dataFilterSlider/pom.xml 2009-05-04 15:14:08 UTC (rev= 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -14,7 +14,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/dataTable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/dataTable/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/dataTable/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.ui richfaces-ui-core - 3.3.1-SNAPSHOT + 3.3.1.CR2 --> Modified: tags/3.3.1.CR2/ui/datascroller/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/datascroller/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/datascroller/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/drag-drop/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/drag-drop/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/drag-drop/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.ui richfaces-ui-core - 3.3.1-SNAPSHOT + 3.3.1.CR2 --> Modified: tags/3.3.1.CR2/ui/dropdown-menu/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/dropdown-menu/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/dropdown-menu/pom.xml 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,12 +44,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui menu-components - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/editor/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/editor/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/editor/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -62,7 +62,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 antlr Modified: tags/3.3.1.CR2/ui/effect/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/effect/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/effect/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/extendedDataTable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/extendedDataTable/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/extendedDataTable/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -1,35 +1,35 @@ - + ui org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.ui - extendedDataTable - extendedDataTable - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - - - org.richfaces - - extendedDataTable - - - + 3.3.1.CR2 + + 4.0.0 + org.richfaces.ui + extendedDataTable + extendedDataTable + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + + + org.richfaces + + extendedDataTable + + + = @@ -57,52 +57,52 @@ = - = - - - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - - org.richfaces.ui - drag-drop - 3.3.1-SNAPSHOT - - - org.richfaces.ui - dataTable - 3.3.1-SNAPSHOT + = + + + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 - - org.richfaces.ui - menu-components - 3.3.1-SNAPSHOT - - - org.richfaces.ui - contextMenu - 3.3.1-SNAPSHOT - - - - org.richfaces.ui - jQuery - 3.3.1-SNAPSHOT - - = - - org.richfaces.ui - componentControl - 3.3.1-SNAPSHOT - - - - org.richfaces.ui - scrollableDataTable - 3.3.1-SNAPSHOT - - + + org.richfaces.ui + drag-drop + 3.3.1.CR2 + + + org.richfaces.ui + dataTable + 3.3.1.CR2 + + + org.richfaces.ui + menu-components + 3.3.1.CR2 + + + org.richfaces.ui + contextMenu + 3.3.1.CR2 + + + + org.richfaces.ui + jQuery + 3.3.1.CR2 + + = + + org.richfaces.ui + componentControl + 3.3.1.CR2 + + + + org.richfaces.ui + scrollableDataTable + 3.3.1.CR2 + + \ No newline at end of file Modified: tags/3.3.1.CR2/ui/fileUpload/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/fileUpload/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/fileUpload/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui fileUpload fileUpload - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -51,12 +51,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui progressBar - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/functions/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/functions/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/functions/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/gmap/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/gmap/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/gmap/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/hotKey/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/hotKey/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/hotKey/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,56 +1,56 @@ - - - ui - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.ui - hotKey - hotKey - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - generate-test-sources - generate-test-sources - - generate-tests - - - - - - org.richfaces - - hotKey - - - - - - - - - junit - junit - 3.8.1 - test - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - + + + ui + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.ui + hotKey + hotKey + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + generate-test-sources + generate-test-sources + + generate-tests + + + + + + org.richfaces + + hotKey + + + + + + + + + junit + junit + 3.8.1 + test + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + \ No newline at end of file Modified: tags/3.3.1.CR2/ui/inplaceInput/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/inplaceInput/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/inplaceInput/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui inplaceInput inplaceInput - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -51,17 +51,17 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui combobox - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/inplaceSelect/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/inplaceSelect/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/inplaceSelect/pom.xml 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui inplaceSelect inplaceSelect - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -51,22 +51,22 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui combobox - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui inplaceInput - 3.3.1-SNAPSHOT + 3.3.1.CR2 = Modified: tags/3.3.1.CR2/ui/inputnumber-slider/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/inputnumber-slider/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/inputnumber-slider/pom.xml 2009-05-04 15:14:08 UTC (r= ev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/inputnumber-spinner/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/inputnumber-spinner/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/inputnumber-spinner/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/insert/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/insert/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/insert/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/jQuery/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/jQuery/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/jQuery/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/layout/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/layout/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,54 +1,54 @@ - - - 4.0.0 - - ui - org.richfaces - 3.3.1-SNAPSHOT - - org.richfaces.ui - layout - 3.3.1-SNAPSHOT - layout - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - generate-sources - - generate - - - - generate-test-sources - generate-test-sources - - generate-tests - - - - - - org.richfaces - - http://richfaces.org/layout - layout - - - - - - - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - - + + + 4.0.0 + + ui + org.richfaces + 3.3.1.CR2 + + org.richfaces.ui + layout + 3.3.1.CR2 + layout + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + generate-sources + + generate + + + + generate-test-sources + generate-test-sources + + generate-tests + + + + + + org.richfaces + + http://richfaces.org/layout + layout + + + + + + + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + + Modified: tags/3.3.1.CR2/ui/listShuttle/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/listShuttle/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/listShuttle/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui Modified: tags/3.3.1.CR2/ui/menu-components/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/menu-components/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/menu-components/pom.xml 2009-05-04 15:14:08 UTC (rev = 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/message/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/message/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/message/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui message - 3.3.1-SNAPSHOT + 3.3.1.CR2 Message = org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/modal-panel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/modal-panel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/modal-panel/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/orderingList/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/orderingList/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/orderingList/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/paint2D/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/paint2D/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/paint2D/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/panel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/panel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/panel/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/panelbar/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/panelbar/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/panelbar/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/panelmenu/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/panelmenu/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/panelmenu/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/pickList/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/pickList/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/pickList/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui pickList pickList - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -53,26 +53,26 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.framework richfaces-api - 3.3.1-SNAPSHOT + 3.3.1.CR2 = = org.richfaces.ui listShuttle - 3.3.1-SNAPSHOT + 3.3.1.CR2 = org.richfaces.ui orderingList - 3.3.1-SNAPSHOT + 3.3.1.CR2 = = Modified: tags/3.3.1.CR2/ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ root org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces @@ -138,12 +138,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.framework richfaces-test - 3.3.1-SNAPSHOT + 3.3.1.CR2 test Modified: tags/3.3.1.CR2/ui/progressBAR/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/progressBAR/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/progressBAR/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui progressBar progressBar - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,12 +45,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/scrollableDataTable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/scrollableDataTable/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/scrollableDataTable/pom.xml 2009-05-04 15:14:08 UTC (= rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -70,17 +70,17 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui dataTable - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui core - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/separator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/separator/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/separator/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/simpleTogglePanel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/simpleTogglePanel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/simpleTogglePanel/pom.xml 2009-05-04 15:14:08 UTC (re= v 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/spacer/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/spacer/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/spacer/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/state/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/state/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/state/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -1,43 +1,43 @@ - - - ui - org.richfaces - 3.3.1-SNAPSHOT - - 4.0.0 - org.richfaces.ui - state - state - - - - org.richfaces.cdk - maven-cdk-plugin - 3.3.1-SNAPSHOT - - - generate-sources - - generate - - - - - - org.richfaces.ui - - state - - - - - - - - - org.richfaces.framework - richfaces-impl - 3.3.1-SNAPSHOT - - + + + ui + org.richfaces + 3.3.1.CR2 + + 4.0.0 + org.richfaces.ui + state + state + + + + org.richfaces.cdk + maven-cdk-plugin + 3.3.1.CR2 + + + generate-sources + + generate + + + + + + org.richfaces.ui + + state + + + + + + + + + org.richfaces.framework + richfaces-impl + 3.3.1.CR2 + + \ No newline at end of file Modified: tags/3.3.1.CR2/ui/suggestionbox/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/suggestionbox/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/suggestionbox/pom.xml 2009-05-04 15:14:08 UTC (rev 14= 007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/tabPanel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/tabPanel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/tabPanel/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/togglePanel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/togglePanel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/togglePanel/pom.xml 2009-05-04 15:14:08 UTC (rev 1400= 7) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/toolBar/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/toolBar/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/toolBar/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/tooltip/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/tooltip/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/tooltip/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -44,7 +44,7 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/tree/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/tree/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/tree/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,7 +45,7 @@ org.richfaces.ui drag-drop - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/treeModel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/treeModel/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/treeModel/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources @@ -45,12 +45,12 @@ org.richfaces.framework richfaces-impl - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.ui tree - 3.3.1-SNAPSHOT + 3.3.1.CR2 \ No newline at end of file Modified: tags/3.3.1.CR2/ui/treeTable/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/treeTable/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/treeTable/pom.xml 2009-05-04 15:14:08 UTC (rev 14007) @@ -2,19 +2,19 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces treeTable treeTable - 3.3.1-SNAPSHOT + 3.3.1.CR2 org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources Modified: tags/3.3.1.CR2/ui/virtualEarth/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/virtualEarth/pom.xml 2009-05-04 08:26:24 UTC (rev 13996) +++ tags/3.3.1.CR2/ui/virtualEarth/pom.xml 2009-05-04 15:14:08 UTC (rev 140= 07) @@ -2,7 +2,7 @@ ui org.richfaces - 3.3.1-SNAPSHOT + 3.3.1.CR2 4.0.0 org.richfaces.ui @@ -13,7 +13,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.1-SNAPSHOT + 3.3.1.CR2 generate-sources --===============7231492333188892132==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 12:32:03 2009 Content-Type: multipart/mixed; boundary="===============8377616607640015701==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14009 - trunk/framework/impl/src/main/java/org/ajax4jsf/request. Date: Mon, 04 May 2009 12:29:31 -0400 Message-ID: --===============8377616607640015701== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-04 12:29:31 -0400 (Mon, 04 May 2009) New Revision: 14009 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest= .java Log: Added additional call to setupProgressData() in parseRequest() - https://ji= ra.jboss.org/jira/browse/RF-6947 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/Multipart= Request.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartReques= t.java 2009-05-04 15:23:57 UTC (rev 14008) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartReques= t.java 2009-05-04 16:29:31 UTC (rev 14009) @@ -610,6 +610,8 @@ public void parseRequest() { canStop =3D true; = + setupProgressData(); + = try { initialize(); = --===============8377616607640015701==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 12:34:23 2009 Content-Type: multipart/mixed; boundary="===============8647208949772574772==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14010 - in trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum: testng and 1 other directory. Date: Mon, 04 May 2009 12:31:50 -0400 Message-ID: --===============8647208949772574772== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-04 12:31:50 -0400 (Mon, 04 May 2009) New Revision: 14010 Added: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/t= estng/ImageResizerTest.java Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/R= ealWorldHelper.java Log: add ImageResizerTest Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photo= album/RealWorldHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= RealWorldHelper.java 2009-05-04 16:29:31 UTC (rev 14009) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= RealWorldHelper.java 2009-05-04 16:31:50 UTC (rev 14010) @@ -123,6 +123,11 @@ = } = + public static interface ResizeSlider { + String TRACK_SLIDER =3D "//td[./div[@class=3D'dr-insldr-track rich-insl= ider-track']]"; + String SLIDER_INPUT =3D "//*[@class=3D'dr-insldr rich-slider']//input[@= type=3D'hidden']"; + } + public static interface Search { String SEARCH_INPUT =3D "//*[@class=3D'search-input']"; String SEARCH_BUTTON =3D "//*[@class=3D'search-find-button']"; Added: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalb= um/testng/ImageResizerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= testng/ImageResizerTest.java (rev 0) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/= testng/ImageResizerTest.java 2009-05-04 16:31:50 UTC (rev 14010) @@ -0,0 +1,60 @@ +package org.richfaces.photoalbum.testng; + +import org.richfaces.photoalbum.SeleniumTestBase; +import org.testng.annotations.Test; +import org.testng.Assert; + +import static org.richfaces.photoalbum.RealWorldHelper.HtmlConstants.Resiz= eSlider.*; + +/** + * @user: akolonitsky + * Date: May 4, 2009 + */ +public class ImageResizerTest extends SeleniumTestBase { + + private static final int LENGTH =3D 200; + = + private static final int VALUE_START =3D 80; + private static final int VALUE_STEP =3D 40; + private static final int VALUE_END =3D 200; + + private static final int VALUE_DEFAULT =3D 120; + + @Test + public void testResize() { + renderPage(); + + selenium.click("//*[@class=3D'album-cover-image'][1]"); + waitForAjaxCompletion(); + + final int count =3D getImageCount(VALUE_DEFAULT); + + for (int i =3D 0; i < (VALUE_END-VALUE_START)/VALUE_STEP; i++) { + testPosition(count, i); + } + } + + private void testPosition(final int count, final int position) { + final int value =3D VALUE_START + position * VALUE_STEP; + + clickSlider(position); + waitForAjaxCompletion(); + Assert.assertEquals(value, getSliderValue()); + Assert.assertEquals(count, getImageCount(value)); + } + + private int getImageCount(final int value) { + return selenium.getXpathCount("//*[@class=3D'preview_box_photo_"+value+"= ']").intValue(); + } + + private void clickSlider(int position) { + final String track =3D TRACK_SLIDER; + final String coords =3D (LENGTH * VALUE_STEP / (VALUE_END - VALUE_START)= * position + 1) + ",1"; + selenium.mouseDownAt(track, coords); + selenium.mouseUpAt(track, coords); + } + + private int getSliderValue() { + return Integer.parseInt(selenium.getValue(SLIDER_INPUT)); + } +} --===============8647208949772574772==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 14:06:49 2009 Content-Type: multipart/mixed; boundary="===============1593472102031337522==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14011 - in trunk/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/util and 3 other directories. Date: Mon, 04 May 2009 14:04:16 -0400 Message-ID: --===============1593472102031337522== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-04 14:04:16 -0400 (Mon, 04 May 2009) New Revision: 14011 Removed: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/TreeManager.java Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/AlbumManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/Controller.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/DnDManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ImageManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/NavigationEnum.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ShelfManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/util/SessionListener.java trunk/examples/photoalbum/source/web/src/main/webapp/includes/album/crea= teAlbum.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload= /uploadResult.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree= .xhtml Log: Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/AlbumManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ package org.richfaces.photoalbum.manager; - +/** + * Class encapsulated all functionality, related to working with album. + * + * @author Andrey Markhel + */ import java.io.Serializable; = import org.jboss.seam.ScopeType; @@ -54,24 +58,39 @@ = @In FacesMessages facesMessages; = + /** + * Method, that invoked on creation of the new album. Only registered use= rs can create new albums. + * @param album - new album + * + */ @Restrict("#{s:hasRole('admin')}") public void addAlbum(Album album){ + //Shelf must be not-null if(album.getShelf() =3D=3D null){ facesMessages.addToControl(Constants.SHELF_ID, Constants.SHELF_MUST_BE_= NOT_NULL_ERROR, null); Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, album); return; } + //All data is valid validationSuccess =3D true; try{ + //Save to DB albumAction.addAlbum(album); }catch(Exception e){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM= _SAVING_ERROR); return; } + //Reset 'album' component in conversation scope Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, null); + //Raise 'albumAdded' event Events.instance().raiseEvent(Constants.ALBUM_ADDED_EVENT, album); } = + /** + * Method, that invoked when user want to create new album. Only registe= red users can create new albums. + * @param shelf - shelf, that will contain new album + * + */ @Restrict("#{s:hasRole('admin')}") public void createAlbum(Shelf shelf){ Album album =3D new Album(); @@ -86,9 +105,15 @@ } } album.setShelf(shelf); + //Reset 'album' component in conversation scope Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, album); } = + /** + * Method, that invoked when user click 'Edit album' button. Only registe= red users can create new albums. + * @param album - edited album + * + */ @Restrict("#{s:hasRole('admin')}") public void editAlbum(Album album){ try{ @@ -97,9 +122,15 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM= _SAVING_ERROR); return; } + //Reset 'album' component in conversation scope Events.instance().raiseEvent(Constants.ALBUM_EDITED_EVENT, album); } = + /** + * Method, that invoked when user click 'Delete album' button. Only regis= tered users can create new albums. + * @param album - album to delete + * + */ @Restrict("#{s:hasRole('admin')}") public void deleteAlbum(Album album){ String pathToDelete =3D album.getPath(); @@ -109,6 +140,7 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM= _DELETING_ERROR); return; } + //Raise 'albumDeleted' event, parameter path - path of Directory to dele= te Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT, album, pathT= oDelete); } = Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/Controller.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -31,6 +31,7 @@ import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; +import org.richfaces.component.UITree; import org.richfaces.photoalbum.domain.Album; import org.richfaces.photoalbum.domain.Image; import org.richfaces.photoalbum.domain.MetaTag; @@ -265,6 +266,15 @@ model.resetModel(NavigationEnum.ANONYM, user, null, null, null, null); } = + @SuppressWarnings("unchecked") + public Boolean adviseNodeSelected(UITree tree) { + Object currentNode =3D tree.getRowData(); + if(currentNode.equals(model.getSelectedAlbum()) || currentNode.equals(mo= del.getSelectedShelf())){ + return true; + } + return false; + } + = public Integer getPage(){ final Integer index =3D model.getSelectedAlbum().getIndex(model.getSelec= tedImage()); return index / 5 + 1; Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/DnDManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/DnDManager.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/DnDManager.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -97,13 +97,13 @@ } = private void addTreeToRerender() { - try { - FacesContext fc =3D FacesContext.getCurrentInstance(); - AjaxContext ac =3D AjaxContext.getCurrentInstance(); - UIComponent destTree =3D fc.getViewRoot().findComponent(Constants.TRE= E_ID); - ac.addComponentToAjaxRender(destTree); - } catch (Exception e) { - System.err.print(e.getMessage()); + try { + FacesContext fc =3D FacesContext.getCurrentInstance(); + AjaxContext ac =3D AjaxContext.getCurrentInstance(); + UIComponent destTree =3D fc.getViewRoot().findComponent(Constants.TREE_= ID); + ac.addComponentToAjaxRender(destTree); + } catch (Exception e) { + System.err.print(e.getMessage()); + } } } -} Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ImageManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ package org.richfaces.photoalbum.manager; - +/** + * Class encapsulated all functionality, related to working with image. + * + * @author Andrey Markhel + */ import java.util.Date; import java.util.List; = @@ -52,6 +56,11 @@ = @In User user; = + /** + * Method, that invoked when user click 'Delete image' button. Only regis= tered users can create new albums. + * @param image - image to delete + * + */ @Restrict("#{s:hasRole('admin')}") public void deleteImage(Image image) { String pathToDelete =3D image.getFullPath(); @@ -61,9 +70,15 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE= _DELETING_ERROR); return; } + //Raise 'imageDeleted' event, parameter path - path of file to delete Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT, image,= pathToDelete); } = + /** + * Method, that invoked when user click 'Edit image' button. Only registe= red users can create new albums. + * @param image - image to edit + * + */ @Restrict("#{s:hasRole('admin')}") public void editImage(Image image, boolean metatagsChanged) { try{ @@ -75,6 +90,12 @@ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, Nav= igationEnum.ALBUM_IMAGE_PREVIEW); } = + /** + * Method, that invoked when user add comment to image. Only registered u= sers can create new albums. + * @param image - image + * @param message - comment text + * + */ @Restrict("#{s:hasRole('admin')}") public void addComment(Image image, String message) { if (null =3D=3D user.getLogin()) { @@ -95,9 +116,15 @@ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SAVE_= COMMENT_ERROR); return; } + //Clear rich:editor component Events.instance().raiseEvent(Constants.CLEAR_EDITOR_EVENT, ""); } = + /** + * Method, that invoked when user delete comment. Only registered users c= an create new albums. + * @param comment - comment to delete + * + */ @Restrict("#{s:hasRole('admin')}") public void deleteComment(Comment comment) { try{ @@ -108,10 +135,21 @@ } } = + /** + * Method, that invoked to retrieve most popular metatags. + * @return List of most popular metatags + * + */ public List popularTags() { return imageAction.getPopularTags(); } = + /** + * Method, that used to autocomplete 'metatags' field while typing. + * @param suggest - text to autocomplete + * @return List of similar metatags + * + */ public List autoComplete(Object suggest) { String temp =3D (String) suggest; if (temp.trim().equals("")) { @@ -120,6 +158,12 @@ return imageAction.getTagsLikeString((String)suggest); } = + /** + * Method, that invoked to retrieve direct link to image, to represent in= UI. + * @param image - image to get direct link + * @return List of similar metatags + * + */ public String getImageDirectLink(Image image) { String directLink =3D null; = @@ -142,12 +186,12 @@ = } = - protected String createServerURL(HttpServletRequest request) { + private String createServerURL(HttpServletRequest request) { StringBuffer url =3D new StringBuffer(); = if(request !=3D null) { String name =3D request.getServerName(); - String protocol =3D (request.getProtocol().split("/"))[0].toLowerCase(); + String protocol =3D (request.getProtocol().split(Constants.SLASH))[0].t= oLowerCase(); = int port =3D request.getServerPort(); = Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/NavigationEnum.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/NavigationEnum.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/NavigationEnum.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -20,6 +20,12 @@ */ package org.richfaces.photoalbum.manager; = +/** + * Class encapsulated all possible states, that can be applied to so calle= d 'mainArea' area on the page. + * + * @author Andrey Markhel + */ + public enum NavigationEnum { ANONYM("includes/publicShelves.xhtml"), FILE_UPLOAD("includes/fileUpload.xhtml"), @@ -44,7 +50,9 @@ private NavigationEnum(String t){ template=3Dt; } + = private String template; + = public String getTemplate() { return template; } Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ShelfManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -20,6 +20,11 @@ */ package org.richfaces.photoalbum.manager; = +/** + * Class encapsulated all functionality, related to working with shelf. + * + * @author Andrey Markhel + */ import java.io.Serializable; import java.util.List; = @@ -51,12 +56,21 @@ = @In User user; = + /** + * Method, that invoked when user want to create new shelf. Only registe= red users can create new albums. + * + */ @Restrict("#{s:hasRole('admin')}") public void createShelf() { Shelf shelf =3D new Shelf(); Contexts.getConversationContext().set(Constants.SHELF_VARIABLE, sh= elf); } = + /** + * Method, that invoked on creation of the new shelf. Only registered use= rs can create new albums. + * @param album - new album + * + */ @Restrict("#{s:hasRole('admin')}") public void addShelf(Shelf shelf) { validationSuccess =3D true; @@ -69,10 +83,11 @@ Events.instance().raiseEvent(Constants.SHELF_ADDED_EVENT, shelf); } = - public List getAvailableShelves(User user) { - return user.getShelves(); - } - + /** + * Method, that invoked when user click 'Edit shelf' button. Only registe= red users can create new albums. + * @param shelf - shelf to edit + * + */ @Restrict("#{s:hasRole('admin')}") public void editShelf(Shelf shelf) { try{ @@ -84,6 +99,11 @@ Events.instance().raiseEvent(Constants.SHELF_EDITED_EVENT, shelf); } = + /** + * Method, that invoked when user click 'Delete shelf' button. Only regis= tered users can create new albums. + * @param image - shelf to delete + * + */ @Restrict("#{s:hasRole('admin')}") public void deleteShelf(Shelf shelf) { String pathToDelete =3D shelf.getPath(); @@ -96,6 +116,12 @@ Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT, shelf,= pathToDelete); } = + /** + * This method used to populate 'pre-defined shelves' tree + * = + * @return List of predefined shelfs + * + */ public List getPredefinedShelves() { if (shelves =3D=3D null) { shelves =3D shelfAction.getPredefinedShelves(); @@ -103,6 +129,12 @@ return shelves; } = + /** + * This method used to populate 'my shelves' tree + * = + * @return List of users shelfs + * + */ public List getUserShelves(){ return user.getShelves(); } Deleted: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/p= hotoalbum/manager/TreeManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/TreeManager.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/TreeManager.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -1,27 +0,0 @@ -package org.richfaces.photoalbum.manager; - -import java.io.Serializable; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.richfaces.component.UITree; - -(a)Name("treeManager") -(a)Scope(ScopeType.EVENT) -public class TreeManager implements Serializable{ - - @In Model model; - = - private static final long serialVersionUID =3D 5656562187249324512L; - = - @SuppressWarnings("unchecked") - public Boolean adviseNodeSelected(UITree tree) { - Object currentNode =3D tree.getRowData(); - if(currentNode.equals(model.getSelectedAlbum()) || currentNode.equals(mo= del.getSelectedShelf())){ - return true; - } - return false; - } -} Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/util/SessionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/SessionListener.java 2009-05-04 16:31:50 UTC (rev 14010) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/SessionListener.java 2009-05-04 18:04:16 UTC (rev 14011) @@ -10,7 +10,9 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Transactional; +import org.jboss.seam.core.Events; import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; = @Scope(ScopeType.SESSION) @Name("sessionListener") @@ -23,11 +25,11 @@ = @Destroy @Transactional @Observer("org.jboss.seam.sessionExpired") public void onDestroy(){ - /*if(user.getId() !=3D null && !user.isPreDefined()){ + if(user.getId() !=3D null && !user.isPreDefined()){ user =3D em.merge(user); em.remove(user); em.flush(); Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user); - }*/ + } } } Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/alb= um/createAlbum.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/fil= eUpload/uploadResult.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ind= ex/tree.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============1593472102031337522==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 14:06:56 2009 Content-Type: multipart/mixed; boundary="===============6204905355479126868==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14012 - in trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum: service and 1 other directory. Date: Mon, 04 May 2009 14:04:24 -0400 Message-ID: --===============6204905355479126868== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-04 14:04:24 -0400 (Mon, 04 May 2009) New Revision: 14012 Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/domain/Comment.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/AlbumAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/ImageAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/ShelfAction.java Log: Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/domain/Comment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/Comment.java 2009-05-04 18:04:16 UTC (rev 14011) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/Comment.java 2009-05-04 18:04:24 UTC (rev 14012) @@ -20,15 +20,8 @@ */ package org.richfaces.photoalbum.domain; = -import org.hibernate.validator.Length; -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.ForeignKey; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import java.io.Serializable; +import java.util.Date; = import javax.persistence.CascadeType; import javax.persistence.Column; @@ -40,8 +33,15 @@ import javax.persistence.ManyToOne; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import java.io.Serializable; -import java.util.Date; + +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.validator.Length; +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; /** * Class for representing Comment Entity. EJB3 Entity Bean * @@ -64,7 +64,7 @@ @JoinColumn(nullable =3D false) private Image image; = - @ManyToOne(fetch =3D FetchType.LAZY) + @ManyToOne(cascade =3D CascadeType.REMOVE, fetch =3D FetchType.LAZY) @OnDelete(action =3D OnDeleteAction.CASCADE) @JoinColumn(nullable =3D true) private User author; Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/AlbumAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/AlbumAction.java 2009-05-04 18:04:16 UTC (rev 14011) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/AlbumAction.java 2009-05-04 18:04:24 UTC (rev 14012) @@ -67,15 +67,18 @@ * @throws PhotoAlbumException */ public void deleteAlbum(Album album) throws PhotoAlbumException { - final Shelf shelf =3D album.getShelf(); + Shelf parentShelf =3D album.getShelf(); try { + if(parentShelf =3D=3D null){ + return; + } album.setCoveringImage(null); - + //Remove from previous shelf = + parentShelf.removeAlbum(album); em.remove(album); em.flush(); - - em.refresh(shelf); } catch (Exception e) { + parentShelf.addAlbum(album); throw new PhotoAlbumException(e.getMessage()); } } Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/ImageAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ImageAction.java 2009-05-04 18:04:16 UTC (rev 14011) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ImageAction.java 2009-05-04 18:04:24 UTC (rev 14012) @@ -32,6 +32,7 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; +import org.richfaces.photoalbum.domain.Album; import org.richfaces.photoalbum.domain.Comment; import org.richfaces.photoalbum.domain.Image; import org.richfaces.photoalbum.domain.MetaTag; @@ -55,13 +56,15 @@ * @throws PhotoAlbumException */ public void deleteImage(Image image) throws PhotoAlbumException { + Album parentAlbum =3D image.getAlbum(); try{ - image.getAlbum().removeImage(image); + parentAlbum.removeImage(image); image.setImageTags(null); = em.remove(image); em.flush(); } catch(Exception e){ + parentAlbum.addImage(image); throw new PhotoAlbumException(e.getMessage()); } } Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/ShelfAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ShelfAction.java 2009-05-04 18:04:16 UTC (rev 14011) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ShelfAction.java 2009-05-04 18:04:24 UTC (rev 14012) @@ -56,10 +56,10 @@ */ public void addShelf(Shelf shelf) throws PhotoAlbumException { try{ - em.persist(shelf); - //Add reference to user - user.addShelf(shelf); - em.flush(); + em.persist(shelf); + //Add reference to user + user.addShelf(shelf); + em.flush(); } catch(Exception e){ throw new PhotoAlbumException(e.getMessage()); @@ -74,11 +74,12 @@ public void deleteShelf(Shelf shelf) throws PhotoAlbumException { try{ //Remove reference from user - user.removeShelf(shelf); - em.remove(shelf); - em.flush(); + user.removeShelf(shelf); + em.remove(shelf); + em.flush(); } catch(Exception e){ + user.addShelf(shelf); throw new PhotoAlbumException(e.getMessage()); } } @@ -90,7 +91,7 @@ */ public void editShelf(Shelf shelf) throws PhotoAlbumException { try{ - em.flush(); + em.flush(); } catch(Exception e){ throw new PhotoAlbumException(e.getMessage()); --===============6204905355479126868==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 14:46:48 2009 Content-Type: multipart/mixed; boundary="===============0991341633126623447==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14013 - trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo. Date: Mon, 04 May 2009 14:13:39 -0400 Message-ID: --===============0991341633126623447== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-04 14:13:39 -0400 (Mon, 04 May 2009) New Revision: 14013 Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/mojo/ResourceDependencyMojo.java Log: fix jar resource resolve Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/mojo/ResourceDependencyMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-04 18:04:24 UTC (rev 14012) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-04 18:13:39 UTC (rev 14013) @@ -22,6 +22,7 @@ = import java.io.File; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.util.Collection; import java.util.Collections; @@ -402,10 +403,10 @@ } = File file =3D artifact.getFile(); - = + try { FileSystemManager manager =3D VFS.getManager(); - jarFileObjects =3D manager.resolveFile("jar://" + file.getAbsolutePath= ()); + jarFileObjects =3D manager.resolveFile("jar:" + file.getAbsolutePath()= ); } catch (FileSystemException e) { getLog().error("Error during processing file: " + file.getAbsolutePath= ()+ "\n" + e.getMessage(), e); } --===============0991341633126623447==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 18:05:26 2009 Content-Type: multipart/mixed; boundary="===============6789346921413912708==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14014 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: dataTable and 2 other directories. Date: Mon, 04 May 2009 18:02:51 -0400 Message-ID: --===============6789346921413912708== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2009-05-04 18:02:51 -0400 (Mon, 04 May 2009) New Revision: 14014 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/jsAPI.xh= tml trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/model.xh= tml trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xh= tml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifia= bleModel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage.= xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage= .xhtml Log: https://jira.jboss.org/jira/browse/RF-5761 Language is checked for updated = Live Demo components 3.3.1 = Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/j= sAPI.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/jsAPI.x= html 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/jsAPI.x= html 2009-05-04 22:02:51 UTC (rev 14014) @@ -51,7 +51,7 @@ prevYear() navigates to the previous year
  • - render(), renderFooter(), renderOptionalFooter(), renderHeader(), re= nderOptionalHeader() - functions to initiate cliend side rendering of t= he calendar or additional elements. + render(), renderFooter(), renderOptionalFooter(), renderHeader(), re= nderOptionalHeader() - functions to initiate client side rendering of t= he calendar or additional elements. =
  • @@ -65,7 +65,7 @@ showSelectedDate() switch calendar to show currently selected d= ate.
  • - today(noUpdate, noHighlight) switch calendar to todayDate. If p= arameters - true, request will not be fired to switch, and additional highl= ighting will be off. = + today(noUpdate, noHighlight) switch calendar to todayDate. If p= arameters are "true", request is not fired to switch, and additio= nal highlighting is off. =

    • Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/m= odel.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/model.x= html 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/model.x= html 2009-05-04 22:02:51 UTC (rev 14014) @@ -25,18 +25,18 @@

    CalendarDataModelItem provides the following methods:

      -
    • Boolean isEnabled() returns true if date is - "selectable" on the calendar, the default implementation returns true -
    • String getStyleClass() returns String that is +
    • Boolean isEnabled() returns "true" if date is + "selectable" on the calendar, the default implementation returns "= ;true"
      • +
    • String getStyleClass() returns "String" that is appended to a style class for the date span. For example it may be - "relevant holiday" that mean a class lools like "rich-cal-day + "relevant holiday" that means a class looks like "rich-cal-day relevant holiday". The default implementation returns an empty string.<= /li>
    • Object getData() returns any additional payload that must be a JSON-serializable object. It may be used in the custom date representation on the calendar (inside the custom facet).
      • -
    • Boolean hasToolTip() returns true if the given date has - an associated one with it tooltip data. The default implementation retu= rns - false.
      • +
    • Boolean hasToolTip() returns "true", if the given = date has + a tooltip. The default implementation returns + "false".
    • Object getToolTip() returns tool tip data that is used in a = "batch" tooltip loading mode.

    Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/u= sage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.x= html 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.x= html 2009-05-04 22:02:51 UTC (rev 14014) @@ -45,7 +45,7 @@ =

    enableManualInput attribute allows to input the date in a text f= ield manually. - The default value is false. It means a user can only select the date fr= om the calendar element. + The default value is false. It means a user can only select date from = the calendar element.

    = = Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/= modifiableModel.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-04 22:02:51 UTC (rev 14014) @@ -14,7 +14,7 @@

    Model class should extend ExtendedDataTableModel and additional= ly implement = Modifiable interface. This interface defines modify meth= od. This = - method will be called with lists of sort and filter fields as paramete= rs and should perform sorting and = + method is called with lists of sort and filter fields as parameters an= d should perform sorting and = filtering according to the fields. =

    Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload= /usage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage= .xhtml 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload/usage= .xhtml 2009-05-04 22:02:51 UTC (rev 14014) @@ -12,10 +12,10 @@ extends functionality of standard input with type=3Dfile= . =

    - Next example shows you File Upload which allows you to upload f= iles to server. = - Files count allowed to upload managed with maxFilesQuantity att= ribute. = - Every uploaded file should be managed through fileUploadListener which called after - every single file upload finished. + The next example shows you File Upload which allows you to uplo= ad files to the server. = + Files number allowed to upload is managed with maxFilesQuantity attribute. = + Every uploaded file should be managed with fileUploadListener w= hich is called after + every single file upload is finished.

    =
    @@ -41,8 +41,8 @@

    File upload could works in automatic upload mode. You should j= ust define = immediateUpload upload attribute as true (false by d= efault) and upload will be started = - just after file added to list. But you could freely manage the list (= add = - or remove some files from list while upload performed) = + just after a file added to the list. But you could easily manage the = list by adding = + or removing some files from the list during the upload. =

    Also starting from 3.2.2 version File Upload could be configured to u= se flash @@ -66,7 +66,7 @@

    - In this example file types restricted to jpg, gif, png and bmp files = using acceptedTypes attribute. = + In this example file types are restricted to jpg, gif, png and bmp fi= les with the help of acceptedTypes attribute. =

    FileUpload uses two init parameters which should be defined in Filter= definition @@ -74,8 +74,8 @@

    • - createTempFiles boolean attribute which defines if the upload= ed files - will be stored in temporary files or available in listener just as b= yte[] data + createTempFiles boolean attribute which defines whether the u= ploaded files + are stored in temporary files or available in listener just as byte[= ] data (false for this example).
    • Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutpu= t/usage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usag= e.xhtml 2009-05-04 18:13:39 UTC (rev 14013) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usag= e.xhtml 2009-05-04 22:02:51 UTC (rev 14014) @@ -17,17 +17,17 @@ The second parameter is a reference to a 'value' attribute of the compo= nent.

      - value attribute references to data that can be used as a input d= ata for a content + value attribute references to data that can be used as input dat= a for a content creator method. The data should be serializable because it is encoded t= o the URL - to the resource. = + of the resource. =

      mimeType attribute defines the type of output content. It is use= d to define = the corresponded type in the header of an HTTP response. =

      - cacheable attribute is a flag that defines the caching strategy.= If 'cachable' - is set to false, the request will be cached. If it is set to true, it w= ill be cached = + cacheable attribute is a flag that defines the caching strategy.= If 'cacheable' + is set to false, the response will not be cached. If it is set to true= , it will be cached = and the serialized value of 'value' attribute plays the role of a cache= key.

      --===============6789346921413912708==-- From richfaces-svn-commits at lists.jboss.org Mon May 4 20:27:20 2009 Content-Type: multipart/mixed; boundary="===============1702895255772213694==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14015 - in trunk: samples/layout-sample/src/main/webapp/pages and 5 other directories. Date: Mon, 04 May 2009 20:24:44 -0400 Message-ID: --===============1702895255772213694== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-04 20:24:43 -0400 (Mon, 04 May 2009) New Revision: 14015 Added: trunk/samples/layout-sample/src/main/webapp/pages/RF-6641.xhtml trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPane= lRenderer.java Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutBe= an.java trunk/samples/layout-sample/src/main/webapp/pages/layout.xhtml trunk/ui/layout/src/main/config/component/layoutPanel.xml trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRend= erer.java trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx Log: Start moving layout panels from CSS to style attributes. Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/L= ayoutBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutB= ean.java 2009-05-04 22:02:51 UTC (rev 14014) +++ trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutB= ean.java 2009-05-05 00:24:43 UTC (rev 14015) @@ -22,7 +22,7 @@ = private boolean rendered =3D true; = - private String width; + private float width; = /** * @return the rendered @@ -41,14 +41,14 @@ /** * @return the width */ - public String getWidth() { + public float getWidth() { return width; } = /** * @param width the width to set */ - public void setWidth(String width) { + public void setWidth(float width) { this.width =3D width; } = Added: trunk/samples/layout-sample/src/main/webapp/pages/RF-6641.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/src/main/webapp/pages/RF-6641.xhtml = (rev 0) +++ trunk/samples/layout-sample/src/main/webapp/pages/RF-6641.xhtml 2009-05= -05 00:24:43 UTC (rev 14015) @@ -0,0 +1,40 @@ + + + + + + + + + + +

      top

      +       + +

      center

      +       + +

      left

      +       + +

      right

      +       + +

      bottom

      +       +       +       + + +

      center-right

      +       +       +       + + \ No newline at end of file Property changes on: trunk/samples/layout-sample/src/main/webapp/pages/RF-6= 641.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/samples/layout-sample/src/main/webapp/pages/layout.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/src/main/webapp/pages/layout.xhtml 2009-05-= 04 22:02:51 UTC (rev 14014) +++ trunk/samples/layout-sample/src/main/webapp/pages/layout.xhtml 2009-05-= 05 00:24:43 UTC (rev 14015) @@ -1,10 +1,10 @@ - @@ -53,12 +54,29 @@ = = - - Center panel - Left - Right - Top - Bottom - +
      +
      Top
      +
      Left + panel xxxx yyy zzz
      +
      +
      +
      Top
      +
      Left + panel xxxx yyy zzz
      +
      Center + panel dhisdf ncdl dcd
      +
      Right + wersdupsdo; osajo;sca
      +
      .<= /div> +
      Bottom
      +
      +
      +
      Right + wersdupsdo; osajo;sca
      +
      .<= /div> +
      Bottom
      +
      = - \ No newline at end of file + \ No newline at end of file Modified: trunk/ui/layout/src/main/config/component/layoutPanel.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-05-04 22= :02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-05-05 00= :24:43 UTC (rev 14015) @@ -38,7 +38,7 @@ = width - java.lang.String + float Sets the width of the layout area Modified: trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPan= el.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.jav= a 2009-05-04 22:02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.jav= a 2009-05-05 00:24:43 UTC (rev 14015) @@ -33,13 +33,13 @@ * Get Panel width. * @return */ - public abstract String getWidth(); + public abstract float getWidth(); = /** * Set Panel width. * @param newvalue */ - public abstract void setWidth(String newvalue); + public abstract void setWidth(float newvalue); = = } Added: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayout= PanelRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPan= elRenderer.java (rev 0) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPan= elRenderer.java 2009-05-05 00:24:43 UTC (rev 14015) @@ -0,0 +1,66 @@ +/** + * = + */ +package org.richfaces.renderkit; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.LayoutPosition; +import org.richfaces.component.UILayout; +import org.richfaces.component.UILayoutPanel; + +/** + * @author asmirnov + * + */ +public abstract class AbstractLayoutPanelRenderer extends + HeaderResourcesRendererBase { + = + public String layoutStyle(FacesContext context, UILayoutPanel panel) { + StringBuilder style =3D new StringBuilder(); + LayoutPosition position =3D panel.getPosition(); + Object componentStyle =3D panel.getAttributes().get(HTML.style_ATTRIBUTE= ); + if(null !=3D componentStyle){ + style.append(componentStyle).append(";"); + } + if(!LayoutPosition.top.equals(position)&&!LayoutPosition.bottom.equals(p= osition)){ + if(LayoutPosition.right.equals(position)){ + style.append("float:right;"); + } else { + style.append("float:left;"); = + } + // find siblings. + // get layout depth. + int deep =3D layoutDeep(panel); + // calculate real width. + float width =3D panel.getWidth(); + if(width>=3D0.0f){ + style.append("width:").append(width).append("%;"); + width =3D width/(1.0f+(float)deep); + style.append("*width:").append(width).append("%;"); + } + } else { + // top and buttom style. + } + return style.length()>0?style.toString():null; + } + + /** + * Calculate deep of layout components. + * @param component + * @return + */ + private int layoutDeep(UIComponent component) { + int deep =3D 0; + if(null !=3D component){ + deep =3D layoutDeep(component.getParent()); + if(component instanceof UILayout){ + deep++; + } + } + return deep; + } +} Property changes on: trunk/ui/layout/src/main/java/org/richfaces/renderkit/= AbstractLayoutPanelRenderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLay= outRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRen= derer.java 2009-05-04 22:02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRen= derer.java 2009-05-05 00:24:43 UTC (rev 14015) @@ -4,6 +4,7 @@ package org.richfaces.renderkit; = import java.io.IOException; +import java.util.Map; = import javax.faces.FacesException; import javax.faces.component.UIComponent; @@ -86,90 +87,23 @@ } if (columns > 0) { // Reorder panels to fill ordeg left->center->right. - if (null =3D=3D left) { - if (null =3D=3D center) { - left =3D right; - right =3D null; - } else { - left =3D center; - center =3D right; - right =3D null; - } - } else if (null =3D=3D center) { - center =3D right; - right =3D null; - } - if (columns > 1) { - // Render Y! CSS Grid - writer.startElement(HTML.DIV_ELEM, layout); - // calculate class. - String yahooClass =3D calculateLayoutClass(left, right, center); - writer.writeAttribute(HTML.class_ATTRIBUTE, yahooClass, null); - left.getAttributes().put("first", "first"); - center.getAttributes().remove("first"); + if (null !=3D left) { left.encodeAll(context); + } = + if (null !=3D center) { center.encodeAll(context); - if (null !=3D right) { - right.getAttributes().remove("first"); - right.encodeAll(context); - } - writer.endElement(HTML.DIV_ELEM); - } else { - left.encodeAll(context); - } + } = + if (null !=3D right) { + right.encodeAll(context); + } = } + // line separator. + writer.startElement(HTML.DIV_ELEM, layout); + writer.writeAttribute(HTML.style_ATTRIBUTE, "display: block; height: 0; = clear: both; visibility: hidden;", null); + writer.writeText(".", null); + writer.endElement(HTML.DIV_ELEM); if (null !=3D bottom) { renderChild(context, bottom); } } - - /** - * @param left - * @param right - * @param center - * @return - */ - protected String calculateLayoutClass(UILayoutPanel left, - UILayoutPanel right, UILayoutPanel center) { - String yahooClass =3D "yui-g"; - if (null !=3D left && null !=3D right && null !=3D center) { - // We have only equal size for an three-column layout. - yahooClass =3D "yui-gb"; - } else if(null !=3D left && null !=3D center){ - int leftPart =3D 0; - String leftWidth =3D left.getWidth(); - if(!isEmpty(leftWidth)){ - leftPart =3D Integer.parseInt(leftWidth); - } - int rightPart =3D 0; - String centerWidth =3D center.getWidth(); - if(!isEmpty(centerWidth)){ - rightPart =3D Integer.parseInt(centerWidth); - if(0 =3D=3DleftPart && 0>rightPart && centerWidth.endsWith("%")){ - leftPart =3D 100 - rightPart; - } - } - if(0 > leftPart && 0 =3D=3D rightPart && leftWidth.endsWith("%")){ - rightPart =3D 100 - leftPart; - } - // Calculate properly class. - if(0>leftPart && 0>rightPart){ - double ratio =3D (double)leftPart/(double)(leftPart+rightPart); - if (ratio <=3D 0.25) { - yahooClass =3D "yui-gf"; - } else if (ratio <=3D 0.33) { - yahooClass =3D "yui-gd"; - } else if (ratio <=3D 0.66) { - yahooClass =3D "yui-gc"; - } else { - yahooClass =3D "yui-ge"; - } - } - } - return yahooClass; - } - - private boolean isEmpty(String leftWidth) { - return null =3D=3D leftWidth || leftWidth.length() =3D=3D 0; - } } Modified: trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java = 2009-05-04 22:02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/java/org/richfaces/taglib/PageTagHandler.java = 2009-05-05 00:24:43 UTC (rev 14015) @@ -45,10 +45,12 @@ if (this.contentType !=3D null) { String v =3D this.contentType.getValue(ctx); ctx.getFacesContext().getExternalContext().getRequestMap()= .put("facelets.ContentType", v); + root.getAttributes().put("contentType", v); } if (this.encoding !=3D null) { String v =3D this.encoding.getValue(ctx); ctx.getFacesContext().getExternalContext().getRequestMap()= .put("facelets.Encoding", v); + root.getAttributes().put("encoding", v); } } } Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx 2009-0= 5-04 22:02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx 2009-0= 5-05 00:24:43 UTC (rev 14015) @@ -11,11 +11,11 @@ baseclass=3D"org.richfaces.renderkit.AbstractLayoutRenderer" component=3D"org.richfaces.component.UILayout" = > - css/layout.css +
      + style=3D"#{component.attributes['style']};zoom:1;" + x:passThruWithExclusions=3D"value,name,type,id,style" > Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.= jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2= 009-05-04 22:02:51 UTC (rev 14014) +++ trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2= 009-05-05 00:24:43 UTC (rev 14015) @@ -8,13 +8,12 @@ xmlns:vcp=3D" http://jsf.exadel.com/vcp" xmlns:x=3D" http://ajax4jsf.org/cdk/x" class=3D"org.richfaces.renderkit.html.LayoutPanelRenderer" - baseclass=3D"org.ajax4jsf.renderkit.AjaxComponentRendererBase" + baseclass=3D"org.richfaces.renderkit.AbstractLayoutPanelRenderer" component=3D"org.richfaces.component.UILayoutPanel" = > - = -
      --===============1702895255772213694==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 04:22:29 2009 Content-Type: multipart/mixed; boundary="===============8271426191560694711==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14016 - trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager. Date: Tue, 05 May 2009 04:19:49 -0400 Message-ID: --===============8271426191560694711== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-05 04:19:49 -0400 (Tue, 05 May 2009) New Revision: 14016 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/AlbumManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ShelfManager.java Log: Fix RF-7008 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/AlbumManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 00:24:43 UTC (rev 14015) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 08:19:49 UTC (rev 14016) @@ -71,6 +71,11 @@ Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, album); return; } + //Album name must be unique in shelf + if(user.hasAlbumWithName(album.getName())){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SA= ME_ALBUM_EXIST_ERROR); + return; + } //All data is valid validationSuccess =3D true; try{ Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ShelfManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 00:24:43 UTC (rev 14015) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 08:19:49 UTC (rev 14016) @@ -73,6 +73,10 @@ */ @Restrict("#{s:hasRole('admin')}") public void addShelf(Shelf shelf) { + if(user.hasShelfWithName(shelf.getName())){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SA= ME_SHELF_EXIST_ERROR); + return; + } validationSuccess =3D true; try{ shelfAction.addShelf(shelf); --===============8271426191560694711==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 04:22:34 2009 Content-Type: multipart/mixed; boundary="===============6319226992434011691==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14017 - in trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum: service and 1 other directory. Date: Tue, 05 May 2009 04:19:54 -0400 Message-ID: --===============6319226992434011691== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-05 04:19:53 -0400 (Tue, 05 May 2009) New Revision: 14017 Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/domain/User.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/Constants.java Log: Fix RF-7008 Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/domain/User.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/User.java 2009-05-05 08:19:49 UTC (rev 14016) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/User.java 2009-05-05 08:19:53 UTC (rev 14017) @@ -371,4 +371,22 @@ result =3D 31 * result + (login !=3D null ? login.hashCode() : 0); return result; } + + public boolean hasShelfWithName(String name) { + for(Shelf s : getShelves()){ + if(s.getName().equals(name)){ + return true; + } + } + return false; + } + = + public boolean hasAlbumWithName(String name) { + for(Album a : getAlbums()){ + if(a.getName().equals(name)){ + return true; + } + } + return false; + } } \ No newline at end of file Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/Constants.java 2009-05-05 08:19:49 UTC (rev 14016) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/Constants.java 2009-05-05 08:19:53 UTC (rev 14017) @@ -53,6 +53,8 @@ public static final String USER_DELETED_EVENT =3D "userDeletedEvent"; = //Errors(Internationalization pending) + public static final String SAME_ALBUM_EXIST_ERROR =3D "You already have a= lbum with given name."; + public static final String SAME_SHELF_EXIST_ERROR =3D "You already have s= helf with given name."; public static final String AVATAR_SAVING_ERROR =3D "Error while saving av= atar to disk"; public static final String YOU_CAN_T_ADD_IMAGES_TO_THAT_ALBUM_ERROR =3D "= You can't add images to that album"; public static final String SHELF_RECENTLY_DELETED_ERROR =3D "This shelf w= as recently deleted. Refresh your browser to see actual data."; --===============6319226992434011691==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 08:21:26 2009 Content-Type: multipart/mixed; boundary="===============1798111184438224091==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14018 - Reports/3.3.1 and 1 other directory. Date: Tue, 05 May 2009 08:18:44 -0400 Message-ID: --===============1798111184438224091== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: tkuprevich Date: 2009-05-05 08:18:44 -0400 (Tue, 05 May 2009) New Revision: 14018 Added: trunk/test-applications/qa/Test Reports/3.3.1/RFTestReport3.3.1.CR2.xls Modified: trunk/test-applications/qa/Test Reports/3.3.1/RFTestReport3.3.1.CR1.xls Log: Modified: trunk/test-applications/qa/Test Reports/3.3.1/RFTestReport3.3.1.C= R1.xls =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/test-applications/qa/Test Reports/3.3.1/RFTestReport3.3.1.CR2.= xls =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/test-applications/qa/Test Reports/3.3.1/RFTestRe= port3.3.1.CR2.xls ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============1798111184438224091==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 09:54:52 2009 Content-Type: multipart/mixed; boundary="===============8956355136388053674==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14019 - in trunk/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/search and 8 other directories. Date: Tue, 05 May 2009 09:52:08 -0400 Message-ID: --===============8956355136388053674== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-05 09:52:08 -0400 (Tue, 05 May 2009) New Revision: 14019 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/AlbumManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/Authenticator.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/DnDManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/FileUploadManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ImageManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ShelfManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/SlideshowManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/UserManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/ISearchOption.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/ImageSearchHelper.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/SearchOptionByAlbum.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/SearchOptionByImage.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/SearchOptionByShelf.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/SearchOptionByTag.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/search/SearchOptionByUser.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/util/CopyImageStuff.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/util/FileUtils.java trunk/examples/photoalbum/source/web/src/main/resources/messages_en.prop= erties trunk/examples/photoalbum/source/web/src/main/webapp/includes/album/albu= mInfo.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/contextMen= u/CMForAlbum.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/contextMen= u/CMForImage.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/contextMen= u/CMForShelf.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/contextMen= u/CMForUser.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imag= eEditInfo.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree= .xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/search.xht= ml trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shel= fInfo.xhtml Log: Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/AlbumManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -115,7 +115,7 @@ } = /** - * Method, that invoked when user click 'Edit album' button. Only registe= red users can create new albums. + * Method, that invoked when user click 'Edit album' button. Only registe= red users can edit albums. * @param album - edited album * */ @@ -132,7 +132,7 @@ } = /** - * Method, that invoked when user click 'Delete album' button. Only regis= tered users can create new albums. + * Method, that invoked when user click 'Delete album' button. Only regis= tered users can delete albums. * @param album - album to delete * */ Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/Authenticator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Authenticator.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Authenticator.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -22,7 +22,6 @@ = import java.io.File; import java.io.Serializable; -import java.security.MessageDigest; = import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; @@ -39,7 +38,6 @@ import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.security.Credentials; import org.jboss.seam.security.Identity; -import org.jboss.seam.util.Hex; import org.richfaces.photoalbum.domain.User; import org.richfaces.photoalbum.service.Constants; import org.richfaces.photoalbum.service.IUserAction; @@ -77,8 +75,7 @@ } catch (LoginException e) { setLoginFailed(true); credentials.clear(); - identity.login(); - identity.addRole(Constants.GUEST_ROLE); + loginAnonymous(); facesMessages.clear(); facesMessages.add(Constants.INVALID_LOGIN_OR_PASSWORD); FacesContext.getCurrentInstance().renderResponse(); @@ -145,9 +142,7 @@ public boolean authenticate() { if (wantLoginAnonymous()) { - identity.addRole(Constants.GUEST_ROLE); - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, Navigati= onEnum.ANONYM); - return true; + return loginAnonymous(); } try { User user =3D userAction.login(credentials.getUsername(), HashUtils.has= h(credentials.getPassword())); @@ -164,6 +159,12 @@ return false; = } = + private boolean loginAnonymous() { + identity.addRole(Constants.GUEST_ROLE); + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, Navigatio= nEnum.ANONYM); + return true; + } + public String logout(){ identity.logout(); return Constants.LOGOUT_OUTCOME; Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/DnDManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/DnDManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/DnDManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ package org.richfaces.photoalbum.manager; - +/** + * Class encapsulated all functionality, related to drag'n'drop process. + * + * @author Andrey Markhel + */ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; = @@ -47,18 +51,25 @@ = @In IAlbumAction albumAction; = + /** + * Listenet, that invoked during drag'n'drop process. Only registered us= ers can drag images. + * + * @param event - event, indicated that drag'n'drop started + */ @Restrict("#{s:hasRole('admin')}") public void processDrop(DropEvent dropEvent) { Dropzone dropzone =3D (Dropzone) dropEvent.getComponent(); Object dragValue =3D dropEvent.getDragValue(); Object dropValue =3D dropzone.getDropValue(); if(dragValue instanceof Image){ - if(!((Album)dropValue).getOwner().getLogin().equals(user.getLogin())){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DND= _PHOTO_ERROR); - return; - } - handleImage((Image)dragValue, (Album)dropValue); = + //If user drag image + if(!((Album)dropValue).getOwner().getLogin().equals(user.getLogin())){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DND_= PHOTO_ERROR); + return; + } + handleImage((Image)dragValue, (Album)dropValue); = }else if(dragValue instanceof Album){ + //If user drag album if(!((Shelf)dropValue).getOwner().getLogin().equals(user.getLogin())){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DND_= ALBUM_ERROR); return; Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/FileUploadManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/FileUploadManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/FileUploadManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -67,11 +67,18 @@ = @In private FileManager fileManager; = + /** + * Listenet, that invoked during file upload process. Only registered us= ers can upload images. + * + * @param event - event, indicated that file upload started + */ @Restrict("#{s:hasRole('admin')}") public void listener(UploadEvent event) throws Exception { UploadItem item =3D event.getUploadItem(); + //Construct image from item Image image =3D constructImage(item); try { + //Extract metadata(size, camera model etc..) extractMetadata(item, image); } catch (Exception e1) { addError(item, image, Constants.FILE_PROCESSING_ERROR); @@ -83,20 +90,26 @@ return; } try{ + //Check if image with given name already exist if(imageAction.isImageWithThisPathExist(image)){ + //If exist generate new path for image image.setPath(generateNewPath(image.getPath())); } + //Save to database imageAction.addImage(image); }catch(Exception e){ addError(item, image, Constants.IMAGE_SAVING_ERROR); return; } + //Save to disk if(!fileManager.addImage(image.getFullPath(), item.getFile().getPath())){ addError(item, image, Constants.FILE_SAVE_ERROR); return; } + //Prepare to show in UI fileWrapper.getFiles().add(image); Events.instance().raiseEvent(Constants.IMAGE_ADDED_EVENT, image); + //Delete temporary fule item.getFile().delete(); } = Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ImageManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -57,7 +57,7 @@ @In User user; = /** - * Method, that invoked when user click 'Delete image' button. Only regis= tered users can create new albums. + * Method, that invoked when user click 'Delete image' button. Only regis= tered users can delete images. * @param image - image to delete * */ @@ -75,7 +75,7 @@ } = /** - * Method, that invoked when user click 'Edit image' button. Only registe= red users can create new albums. + * Method, that invoked when user click 'Edit image' button. Only registe= red users can edit images. * @param image - image to edit * */ @@ -91,7 +91,7 @@ } = /** - * Method, that invoked when user add comment to image. Only registered u= sers can create new albums. + * Method, that invoked when user add comment to image. Only registered u= sers can add comments to image. * @param image - image * @param message - comment text * @@ -121,7 +121,7 @@ } = /** - * Method, that invoked when user delete comment. Only registered users c= an create new albums. + * Method, that invoked when user delete comment. Only registered users c= an delete comments. * @param comment - comment to delete * */ Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ShelfManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -57,7 +57,7 @@ @In User user; = /** - * Method, that invoked when user want to create new shelf. Only registe= red users can create new albums. + * Method, that invoked when user want to create new shelf. Only registe= red users can create new shelves. * */ @Restrict("#{s:hasRole('admin')}") @@ -67,7 +67,7 @@ } = /** - * Method, that invoked on creation of the new shelf. Only registered use= rs can create new albums. + * Method, that invoked on creation of the new shelf. Only registered use= rs can create new shelves. * @param album - new album * */ @@ -88,7 +88,7 @@ } = /** - * Method, that invoked when user click 'Edit shelf' button. Only registe= red users can create new albums. + * Method, that invoked when user click 'Edit shelf' button. Only registe= red users can edit shelves. * @param shelf - shelf to edit * */ @@ -104,7 +104,7 @@ } = /** - * Method, that invoked when user click 'Delete shelf' button. Only regis= tered users can create new albums. + * Method, that invoked when user click 'Delete shelf' button. Only regis= tered users can delete shelves. * @param image - shelf to delete * */ @@ -123,7 +123,7 @@ /** * This method used to populate 'pre-defined shelves' tree * = - * @return List of predefined shelfs + * @return List of predefined shelves * */ public List getPredefinedShelves() { @@ -136,7 +136,7 @@ /** * This method used to populate 'my shelves' tree * = - * @return List of users shelfs + * @return List of users shelves * */ public List getUserShelves(){ Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/SlideshowManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/SlideshowManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/SlideshowManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ package org.richfaces.photoalbum.manager; - +/** + * Class encapsulated all functionality, related to working with slideshow. + * + * @author Andrey Markhel + */ import java.io.Serializable; = import org.jboss.seam.ScopeType; @@ -64,6 +68,10 @@ this.active =3D active; } = + /** + * This method invoked after user click on 'Start slideshow' button and n= o image is selected. After execution of this method slideshow will be activ= ated. + * + */ public void startSlideshow(){ active =3D true; this.slideshowIndex =3D 0; @@ -73,7 +81,9 @@ return; } this.selectedImage =3D model.getImages().get(this.slideshowIndex); + //mark image as 'visited' this.selectedImage.setVisited(true); + //Check if that image was recently deleted. If yes, immediately stop sli= deshow FileManager fileManager =3D (FileManager)Contexts.getApplicationContext(= ).get(Constants.FILE_MANAGER_COMPONENT); if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE= _RECENTLY_DELETED_ERROR); @@ -83,6 +93,11 @@ } } = + /** + * This method invoked after user click on 'Start slideshow' button. Afte= r execution of this method slideshow will be activated starting from select= ed image. + * + *@param selectedImage - first image to show during slideshow + */ public void startSlideshow(Image selectedImage){ active =3D true; if(model.getImages() =3D=3D null || model.getImages().size() < 1){ @@ -92,7 +107,9 @@ } this.slideshowIndex =3D model.getImages().indexOf(selectedImage); this.selectedImage =3D selectedImage; + //mark image as 'visited' this.selectedImage.setVisited(true); + //Check if that image was recently deleted. If yes, immediately stop sli= deshow FileManager fileManager =3D (FileManager)Contexts.getApplicationContext(= ).get(Constants.FILE_MANAGER_COMPONENT); if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE= _RECENTLY_DELETED_ERROR); @@ -102,6 +119,10 @@ } } = + /** + * This method invoked after user click on 'Stop slideshow' button. After= execution of this method slideshow will be de-activated. + * + */ @Observer(Constants.STOP_SLIDESHOW_EVENT) public void stopSlideshow(){ active =3D false; @@ -125,16 +146,23 @@ this.selectedImage =3D selectedImage; } = + /** + * This method used to prepare next image to show during slideshow + * + */ public void showNextImage(){ if(!active){ return; } + //reset index if we reached last image if(slideshowIndex =3D=3D model.getImages().size() - 1){ slideshowIndex =3D -1; } slideshowIndex++; selectedImage =3D model.getImages().get(slideshowIndex); + //mark image as 'visited' this.selectedImage.setVisited(true); + //Check if that image was recently deleted. If yes, stopping slideshow FileManager fileManager =3D (FileManager)Contexts.getApplicationContext(= ).get(Constants.FILE_MANAGER_COMPONENT); if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE= _RECENTLY_DELETED_ERROR); Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/UserManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/UserManager.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/UserManager.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ package org.richfaces.photoalbum.manager; - +/** + * Class encapsulated all functionality, related to working with user. + * + * @author Andrey Markhel + */ import java.io.File; import java.io.Serializable; = @@ -51,8 +55,13 @@ = @In IUserAction userAction; = + /** + * Method, that invoked when user want to edit her profile. + * + */ @Observer(Constants.EDIT_USER_EVENT) public void editUser(){ + //If new avatar was uploaded if (avatarData !=3D null) { if(!fileManager.saveAvatar(avatarData, user)){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.FILE= _IO_ERROR); @@ -71,6 +80,10 @@ } } = + /** + * Method, that invoked when user click 'Cancel' button during edit her = profile. + * + */ @Observer(Constants.CANCEL_EDIT_USER_EVENT) public void cancelEditUser() { avatarData =3D null; Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/ISearchOption.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/ISearchOption.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/ISearchOption.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -8,21 +8,37 @@ import org.richfaces.photoalbum.service.ISearchAction; = /** + * Abstract class, that represent base functionality for particular search= option(album, shelf, etc..) * @author Andrey Markavtsov * */ public abstract class ISearchOption { = - private static final String TEMPLATE =3D "/includes/search/result/albumsR= esult.xhtml"; - private boolean selected =3D true; = private List searchResult; = - = + /** + * Abstract method, that return name of particular search option. This na= me used in UI as header of rich:tab. Must be implemented in sub-classes + * + * @return name + */ public abstract String getName(); = + /** + * Abstract method, that return description of particular search option. = This description used in UI as header of page with search result. Must be i= mplemented in sub-classes + * + * @return description of search option + */ public abstract String getSearchResultName(); = + /** + * Abstract method, that perform search in given option. Must be implemen= ted in sub-classes + * + * @param action - action will be performed + * @param searchQuery - query to search + * @param searchInMyAlbums - is search in users albums will be performed + * @param searchInShared - is search in shared albums will be performed + */ public abstract void search(ISearchAction action, String searchQuery, boo= lean searchInMyAlbums, boolean searchInShared); = public boolean getSelected() { @@ -38,9 +54,12 @@ return getName(); } = - public String getSearchResultTemplate() { - return TEMPLATE; - } + /** + * Abstract method, that return template to render of particular search o= ption. Must be implemented in sub-classes + * + * @return template to render + */ + public abstract String getSearchResultTemplate(); = public List getSearchResult() { return searchResult; Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/ImageSearchHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/ImageSearchHelper.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/ImageSearchHelper.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -15,7 +15,11 @@ import org.richfaces.photoalbum.manager.NavigationEnum; import org.richfaces.photoalbum.service.Constants; import org.richfaces.photoalbum.service.ISearchAction; - +/** + * Class, that encapsulate functionality related to search process. + * @author Andrey Markavtsov + * + */ @Name("searchImageHelper") @Scope(ScopeType.CONVERSATION) @AutoCreate @@ -41,6 +45,10 @@ = boolean searchInShared =3D true; = + /** + * Default constructor. During instantiation populate in field options al= l possible search options + * + */ public ImageSearchHelper() { options =3D new ArrayList(); options.add(new SearchOptionByShelf()); @@ -50,6 +58,9 @@ options.add(new SearchOptionByTag()); } = + /** + * Method, used to construct criteria string, to represent this string in= UI. + */ public String getCriteriaString(){ StringBuilder s =3D new StringBuilder(); for(ISearchOption option:options) { @@ -63,19 +74,27 @@ return s.toString(); } = + /** + * Method, that perform search, when user clicks by 'Find' button. + */ public void search() { if(!isSearchOptionSelected()){ + //If no options selected Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SEARC= H_NO_OPTIONS_ERROR); return; } if(!isWhereSearchOptionSelected()){ + //If both search in My and search is shared unselected Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SEARC= H_NO_WHERE_OPTIONS_ERROR); return; } keywords =3D new ArrayList(); + //Update view Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, Navigatio= nEnum.SEARCH); + // parse query keywords =3D parse(searchQuery); Iterator it =3D options.iterator(); + //Search by first keyword by default selectedKeyword =3D keywords.get(0).trim(); while (it.hasNext()) { ISearchOption option =3D it.next(); @@ -84,11 +103,11 @@ } } } - = - private boolean isWhereSearchOptionSelected() { - return seachInMyAlbums || searchInShared; - } = + /** + * Method, that perform search by particular phrase + * @param keyword - keyword to search + */ public void search(String keyword) { if(!isSearchOptionSelected()){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SEARC= H_NO_OPTIONS_ERROR); @@ -104,25 +123,9 @@ } } = - private List parse(String searchQuery2) { - return Arrays.asList(searchQuery2.split(Constants.COMMA)); - } - - boolean isOptionSelected() { - return selectedOption !=3D null; - } - = - private boolean isSearchOptionSelected() { - boolean isOptionSelected =3D false; - for(ISearchOption i : options){ - if(i.getSelected()){ - isOptionSelected =3D true; - break; - } - } - return isOptionSelected; - } - = + /** + * Method, invoked when user select or unselect search option. + */ public void processSelection() { Iterator it =3D options.iterator(); while (it.hasNext()) { @@ -189,4 +192,36 @@ public void setSelectedKeyword(String selectedKeyword) { this.selectedKeyword =3D selectedKeyword; } + = + public boolean isResultExist(){ + for(ISearchOption option : options){ + if(option.getSelected() && option.getSearchResult().size() > 0){ + return true; + } + } + return false; + } + = + private List parse(String searchQuery2) { + return Arrays.asList(searchQuery2.split(Constants.COMMA)); + } + + private boolean isWhereSearchOptionSelected() { + return seachInMyAlbums || searchInShared; + } + = + boolean isOptionSelected() { + return selectedOption !=3D null; + } + = + private boolean isSearchOptionSelected() { + boolean isOptionSelected =3D false; + for(ISearchOption i : options){ + if(i.getSelected()){ + isOptionSelected =3D true; + break; + } + } + return isOptionSelected; + } } \ No newline at end of file Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/SearchOptionByAlbum.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByAlbum.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByAlbum.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -1,31 +1,40 @@ package org.richfaces.photoalbum.search; = import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; = import org.richfaces.photoalbum.domain.Album; import org.richfaces.photoalbum.service.ISearchAction; - - +/** + * Class, that encapsulate functionality related to search by album entity. + * @author Andrey Markavtsov + * + */ public class SearchOptionByAlbum extends ISearchOption { = private static final String TEMPLATE =3D "/includes/search/result/albumsR= esult.xhtml"; private static final String ALBUMS_SEARCH_RESULT =3D "Albums search resul= t"; private static final String ALBUMS =3D "Albums"; - Map params =3D new HashMap(); = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#getName() + */ @Override public String getName() { return ALBUMS; } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultName= () + */ @Override public String getSearchResultName() { return ALBUMS_SEARCH_RESULT; } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#search() + */ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbu= ms, boolean searchInShared) { List searchByAlbum =3D action.searchByAlbum(q, searchInMyAlbums, = searchInShared); @@ -36,16 +45,11 @@ } } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultTemp= late() + */ @Override public String getSearchResultTemplate() { return TEMPLATE; } - - public Map getParams() { - return params; - } - - public void setParams(Map params) { - this.params =3D params; - } } \ No newline at end of file Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/SearchOptionByImage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByImage.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByImage.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -4,14 +4,13 @@ package org.richfaces.photoalbum.search; = import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; = import org.richfaces.photoalbum.domain.Image; import org.richfaces.photoalbum.service.ISearchAction; = /** + * Class, that encapsulate functionality related to search by image entity. * @author Andrey Markavtsov * */ @@ -20,7 +19,6 @@ private static final String TEMPLATE =3D "/includes/search/result/imageRe= sult.xhtml"; private static final String IMAGES_SEARCH_RESULT =3D "Images search resul= t"; private static final String IMAGES =3D "Images"; - Map params =3D new HashMap(); = /* (non-Javadoc) * @see org.richfaces.photoalbum.search.ISearchOption#getName() @@ -29,11 +27,17 @@ return IMAGES; } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultName= () + */ @Override public String getSearchResultName() { return IMAGES_SEARCH_RESULT; } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#search() + */ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbu= ms, boolean searchInShared) { List searchByImage =3D action.searchByImage(q, searchInMyAlbums, = searchInShared); @@ -44,16 +48,11 @@ } } = + /* (non-Javadoc) + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultTemp= late() + */ @Override public String getSearchResultTemplate() { return TEMPLATE; } - - public Map getParams() { - return params; - } - - public void setParams(Map params) { - this.params =3D params; - } } \ No newline at end of file Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/SearchOptionByShelf.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByShelf.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByShelf.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -10,7 +10,8 @@ import org.richfaces.photoalbum.service.ISearchAction; = /** - * @author Andrey + * Class, that encapsulate functionality related to search by shelf entity. + * @author Andrey Markavtsov * */ public class SearchOptionByShelf extends ISearchOption { Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/SearchOptionByTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByTag.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByTag.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -10,7 +10,8 @@ import org.richfaces.photoalbum.service.ISearchAction; = /** - * @author Andrey + * Class, that encapsulate functionality related to search by metatag enti= ty. + * @author Andrey Markavtsov * */ public class SearchOptionByTag extends ISearchOption { Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/search/SearchOptionByUser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByUser.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/search/SearchOptionByUser.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -10,6 +10,7 @@ import org.richfaces.photoalbum.service.ISearchAction; = /** + * Class, that encapsulate functionality related to search by user entity. * @author Andrey Markavtsov * */ Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/util/CopyImageStuff.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/CopyImageStuff.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/CopyImageStuff.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -3,14 +3,6 @@ */ package org.richfaces.photoalbum.util; = -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Startup; -import org.jboss.seam.contexts.ServletLifecycle; import static org.richfaces.photoalbum.service.Constants.IMAGE_FOLDER; import static org.richfaces.photoalbum.service.Constants.PHOTOALBUM_FOLDER; import static org.richfaces.photoalbum.service.Constants.TEMP_DIR; @@ -19,13 +11,24 @@ import static org.richfaces.photoalbum.util.FileUtils.deleteDirectory; import static org.richfaces.photoalbum.util.FileUtils.joinFiles; = -import javax.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; = +import javax.servlet.ServletContext; = +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Startup; +import org.jboss.seam.contexts.ServletLifecycle; + + /** + * Utility class, that perform copying images from ear file to temp folder= at startup application * @author Andrey Markavtsov * */ @@ -43,14 +46,21 @@ = private String imageSrc; = + /** + * Method, that perform copying images from ear file to temp folder at st= artup application + * + */ @Create public void create() throws IOException { resolveImageFolder(); resolveUploadRoot(); - copyImages(); } = + /** + * Method, that perform deleting images from temp folder during destroy a= pplication + * + */ @Destroy public void destroy()throws IOException { deleteDirectory(uploadRoot, true); Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/util/FileUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/FileUtils.java 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/FileUtils.java 2009-05-05 13:52:08 UTC (rev 14019) @@ -12,6 +12,11 @@ import javax.imageio.ImageWriter; import javax.imageio.stream.ImageInputStream; = +/** + * Utility class for operations with file-system + * + */ + public class FileUtils { = private static final String JPEG =3D "jpeg"; @@ -20,6 +25,10 @@ private static final boolean CLOCK =3D true; private static final boolean VERIFY =3D true; = + /** + * Utility method for copying file + * + */ public static void copyFile(File srcFile, File destFile) throws IOExce= ption { if (!srcFile.getPath().toLowerCase().endsWith(JPG) && !srcFile.get= Path().toLowerCase().endsWith(JPEG)) { return; @@ -54,6 +63,10 @@ } } = + /** + * Utility method for copying directory + * + */ public static void copyDirectory(File srcDir, File dstDir) throws IOException { = @@ -74,6 +87,10 @@ } } = + /** + * Utility method for delete directory + * + */ public static boolean deleteDirectory(File dir , boolean isInitialDele= te){ if (dir.isDirectory()) { if (dir.exists()) { @@ -100,6 +117,10 @@ return true; } = + /** + * Utility method for concatenation names of collection of files + * + */ public static String joinFiles(String... files) { final StringBuilder res =3D new StringBuilder(); for (String file : files) { @@ -109,7 +130,10 @@ return res.substring(0, res.length() - 1); } = - = + /** + * Utility method for delete file + * + */ public static void deleteFile(File file) { if (file.exists()) { file.delete(); @@ -207,6 +231,10 @@ return ret; } = + /** + * Utility method for creation of directory + * + */ public static void addDirectory(File directory) { if (directory.exists()) { deleteDirectory(directory, false); Modified: trunk/examples/photoalbum/source/web/src/main/resources/messages_= en.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/resources/messages_en.pro= perties 2009-05-05 12:18:44 UTC (rev 14018) +++ trunk/examples/photoalbum/source/web/src/main/resources/messages_en.pro= perties 2009-05-05 13:52:08 UTC (rev 14019) @@ -105,6 +105,7 @@ confirm.ok=3DOK confirm.cancel=3DCancel shelf.edit=3DEdit shelf properties +shelf.view=3DView shelf shelf.delete=3DDelete shelf album.edit=3DEdit album properties album.delete=3DDelete album @@ -221,7 +222,7 @@ created.image=3DCaptured contain=3Dcontain pics_into=3Dimages into -new=3Dnew +new=3D new shelf.albums=3Dalbums images_=3Dimages tags=3DTags Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/alb= um/albumInfo.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/con= textMenu/CMForAlbum.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/con= textMenu/CMForImage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/con= textMenu/CMForShelf.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/con= textMenu/CMForUser.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ima= ge/imageEditInfo.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ind= ex/tree.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/sea= rch.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/she= lf/shelfInfo.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8956355136388053674==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 09:56:58 2009 Content-Type: multipart/mixed; boundary="===============3238869451531837705==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14020 - trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/util. Date: Tue, 05 May 2009 09:54:14 -0400 Message-ID: --===============3238869451531837705== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-05 09:54:14 -0400 (Tue, 05 May 2009) New Revision: 14020 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/util/CopyImageStuff.java Log: fix deploying on JBoss 5.0 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/util/CopyImageStuff.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/CopyImageStuff.java 2009-05-05 13:52:08 UTC (rev 14019) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/CopyImageStuff.java 2009-05-05 13:54:14 UTC (rev 14020) @@ -3,7 +3,6 @@ */ package org.richfaces.photoalbum.util; = -import static org.richfaces.photoalbum.service.Constants.IMAGE_FOLDER; import static org.richfaces.photoalbum.service.Constants.PHOTOALBUM_FOLDER; import static org.richfaces.photoalbum.service.Constants.TEMP_DIR; import static org.richfaces.photoalbum.service.Constants.UPLOAD_FOLDER_PAT= H_ERROR; @@ -70,8 +69,9 @@ final ServletContext servletContext =3D ServletLifecycle.getServletConte= xt(); = if (servletContext !=3D null) { - this.imageSrc =3D getClass().getClassLoader().getResource(IMAGE_FOLDER)= .getPath(); - }else { +// this.imageSrc =3D getClass().getClassLoader().getResource(IMAGE_FOLDE= R).getPath(); + this.imageSrc =3D ServletLifecycle.getServletContext().getRealPath("WEB= -INF/classes/Upload"); + } else { throw new IllegalStateException(UPLOAD_FOLDER_PATH_ERROR); } = --===============3238869451531837705==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 10:41:17 2009 Content-Type: multipart/mixed; boundary="===============3918967765381275491==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14021 - in trunk/ui/contextMenu/src/main: java/org/richfaces/component and 1 other directory. Date: Tue, 05 May 2009 10:38:33 -0400 Message-ID: --===============3918967765381275491== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-05 10:38:33 -0400 (Tue, 05 May 2009) New Revision: 14021 Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu= .java Log: https://jira.jboss.org/jira/browse/RF-3532 Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-05-= 05 13:54:14 UTC (rev 14020) +++ trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-05-= 05 14:38:33 UTC (rev 14021) @@ -56,9 +56,9 @@ disableDefaultMenu boolean - Forbids default handling for adjusted event. Default value= "true". = + Forbids default handling for adjusted event. Default value= "false". = - + showDelay Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UICont= extMenu.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMen= u.java 2009-05-05 13:54:14 UTC (rev 14020) +++ trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMen= u.java 2009-05-05 14:38:33 UTC (rev 14021) @@ -21,11 +21,7 @@ = package org.richfaces.component; = -import javax.el.ELException; -import javax.el.ValueExpression; -import javax.faces.FacesException; import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; = /** * @author Maksim Kaszynski @@ -37,9 +33,6 @@ public static final String ON_CONTEXT_MENU =3D "onContextMenu"; public static final String DISABLE_DEFAULT_MENU =3D "disableDefaultMen= u"; = - private boolean disableDefaultMenu =3D false; - private boolean disableDefaultMenuSet =3D false; - = public abstract boolean isAttached(); public abstract void setAttached(boolean b); = @@ -55,45 +48,7 @@ public abstract void setShowDelay(Integer showDelay); public abstract Integer getShowDelay(); = - public boolean isDisableDefaultMenu() { - if (this.disableDefaultMenuSet) { - return this.disableDefaultMenu; - } - = - ValueExpression ve =3D getValueExpression(DISABLE_DEFAULT_MENU); - if (ve !=3D null) { - try { - Boolean value =3D (Boolean) ve.getValue(getFacesContext().= getELContext()); - if (value !=3D null) { - return value; - } - } catch (ELException e) { - throw new FacesException(e); - } - } - = - return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent()); - } + public abstract boolean isDisableDefaultMenu(); + public abstract void setDisableDefaultMenu(boolean disableDefault); = - public void setDisableDefaultMenu(boolean disableDefault) { - this.disableDefaultMenu =3D disableDefault; - this.disableDefaultMenuSet =3D true; - } - = - @Override - public Object saveState(FacesContext context) { - Object[] state =3D new Object[9]; - state[0] =3D super.saveState(context); - state[1] =3D isDisableDefaultMenu(); - state[2] =3D disableDefaultMenuSet; - return state; - } - = - @Override - public void restoreState(FacesContext context, Object state) { - Object[] states =3D (Object[]) state; - super.restoreState(context, states[0]); - disableDefaultMenu =3D (Boolean) states[1]; - disableDefaultMenuSet =3D (Boolean) states[2]; - } } --===============3918967765381275491==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 12:32:09 2009 Content-Type: multipart/mixed; boundary="===============0210175515377967006==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14022 - in trunk/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/util and 8 other directories. Date: Tue, 05 May 2009 12:29:24 -0400 Message-ID: --===============0210175515377967006== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-05 12:29:24 -0400 (Tue, 05 May 2009) New Revision: 14022 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/AlbumManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/Controller.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ImageManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/manager/ShelfManager.java trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoal= bum/util/SessionListener.java trunk/examples/photoalbum/source/web/src/main/resources/messages_en.prop= erties trunk/examples/photoalbum/source/web/src/main/webapp/includes/album/crea= teAlbum.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imag= eEditInfo.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inpu= tNumberSlider.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/menu= .xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/misc/confi= rmation.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/search.xht= ml trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/crea= teShelf.xhtml trunk/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/= userPrefsEdit.xhtml Log: Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/AlbumManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/AlbumManager.java 2009-05-05 16:29:24 UTC (rev 14022) @@ -125,6 +125,7 @@ albumAction.editAlbum(album); }catch(Exception e){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM= _SAVING_ERROR); + albumAction.resetAlbum(album); return; } //Reset 'album' component in conversation scope Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/Controller.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/Controller.java 2009-05-05 16:29:24 UTC (rev 14022) @@ -287,6 +287,14 @@ return image.isOwner(user); } = + public boolean isUserHaveShelves(){ + return user.getShelves().size() > 0 ; + } + = + public boolean isUserHaveAlbums(){ + return user.getAlbums().size() > 0 ; + } + = public boolean isUserShelf(Shelf shelf){ return shelf !=3D null && shelf.isOwner(user); } Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ImageManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ImageManager.java 2009-05-05 16:29:24 UTC (rev 14022) @@ -85,6 +85,7 @@ imageAction.editImage(image, metatagsChanged); }catch(Exception e){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE= _SAVING_ERROR); + imageAction.resetImage(image); return; } Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, Nav= igationEnum.ALBUM_IMAGE_PREVIEW); Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/manager/ShelfManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/manager/ShelfManager.java 2009-05-05 16:29:24 UTC (rev 14022) @@ -98,6 +98,7 @@ shelfAction.editShelf(shelf); }catch(Exception e){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SHELF= _SAVING_ERROR); + shelfAction.resetShelf(shelf); return; } Events.instance().raiseEvent(Constants.SHELF_EDITED_EVENT, shelf); Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/= photoalbum/util/SessionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/SessionListener.java 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoa= lbum/util/SessionListener.java 2009-05-05 16:29:24 UTC (rev 14022) @@ -1,5 +1,7 @@ package org.richfaces.photoalbum.util; = +import java.util.List; + import javax.persistence.EntityManager; = import org.jboss.seam.ScopeType; @@ -11,8 +13,10 @@ import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Events; +import org.richfaces.photoalbum.domain.Comment; import org.richfaces.photoalbum.domain.User; import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IImageAction; = @Scope(ScopeType.SESSION) @Name("sessionListener") @@ -21,12 +25,18 @@ = @In(required=3Dfalse) User user; = + @In IImageAction imageAction; + = @In(value=3D"entityManager") EntityManager em; = @Destroy @Transactional @Observer("org.jboss.seam.sessionExpired") public void onDestroy(){ if(user.getId() !=3D null && !user.isPreDefined()){ user =3D em.merge(user); + List userComments =3D imageAction.findAllUserComments(user); + for(Comment c : userComments){ + em.remove(c); + } em.remove(user); em.flush(); Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user); Modified: trunk/examples/photoalbum/source/web/src/main/resources/messages_= en.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/resources/messages_en.pro= perties 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/resources/messages_en.pro= perties 2009-05-05 16:29:24 UTC (rev 14022) @@ -260,7 +260,7 @@ search_criteria=3DSearch criteria: keywords=3DKeywords: user_profile_=3DUser profile - +message_authorHeader=3DAuthor all_new_images=3DAll new images in_album=3Din album public_shelves=3DPre-defined Shelves Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/alb= um/createAlbum.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ima= ge/imageEditInfo.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ima= ge/inputNumberSlider.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inp= utNumberSlider.xhtml 2009-05-05 14:38:33 UTC (rev 14021) +++ trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inp= utNumberSlider.xhtml 2009-05-05 16:29:24 UTC (rev 14022) @@ -8,7 +8,7 @@
      + step=3D"40" width=3D"100">
      \ No newline at end of file Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/ind= ex/menu.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/mis= c/confirmation.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/sea= rch.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/she= lf/createShelf.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/use= rPrefs/userPrefsEdit.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============0210175515377967006==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 12:32:31 2009 Content-Type: multipart/mixed; boundary="===============2740555234980945753==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14023 - in trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum: service and 1 other directory. Date: Tue, 05 May 2009 12:29:40 -0400 Message-ID: --===============2740555234980945753== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-05 12:29:40 -0400 (Tue, 05 May 2009) New Revision: 14023 Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/domain/Comment.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/domain/User.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/AlbumAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/Constants.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/IAlbumAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/IImageAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/IShelfAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/ImageAction.java trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoal= bum/service/ShelfAction.java Log: Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/domain/Comment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/Comment.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/Comment.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -64,7 +64,7 @@ @JoinColumn(nullable =3D false) private Image image; = - @ManyToOne(cascade =3D CascadeType.REMOVE, fetch =3D FetchType.LAZY) + @ManyToOne(fetch =3D FetchType.LAZY) @OnDelete(action =3D OnDeleteAction.CASCADE) @JoinColumn(nullable =3D true) private User author; Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/domain/User.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/User.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/domain/User.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -66,6 +66,10 @@ query =3D "select u from User u where u.login =3D :username and u.passw= ordHash =3D :password" ), @NamedQuery( + name =3D "user-comments", + query =3D "select c from Comment c where c.author =3D :author" + ), + @NamedQuery( name =3D "user-exist", query =3D "select u from User u where u.login =3D :login" ), Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/AlbumAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/AlbumAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/AlbumAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -96,4 +96,12 @@ throw new PhotoAlbumException(e.getMessage()); } } + = + /** + * Refresh state of given album + * @param album - album to Synchronize + */ + public void resetAlbum(Album album) { + em.refresh(album); + } } Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/Constants.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/Constants.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -170,6 +170,8 @@ public static final String SEARCH_NO_OPTIONS_ERROR =3D "You must select a= t least one search option"; public static final String TREE_ID =3D "treeform"; public static final String SEARCH_NO_WHERE_OPTIONS_ERROR =3D "You must sp= ecify where search execute"; + public static final String USER_COMMENTS_QUERY =3D "user-comments"; + public static final String AUTHOR_PARAMETER =3D "author"; private Constants(){ } } \ No newline at end of file Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/IAlbumAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IAlbumAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IAlbumAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -38,5 +38,7 @@ void deleteAlbum(Album album) throws PhotoAlbumException; = void editAlbum(Album album) throws PhotoAlbumException; + = + public void resetAlbum(Album album); = } \ No newline at end of file Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/IImageAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IImageAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IImageAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -27,6 +27,7 @@ import org.richfaces.photoalbum.domain.Comment; import org.richfaces.photoalbum.domain.Image; import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.User; = /** * Interface for manipulating with image entity @@ -55,4 +56,8 @@ = public boolean isImageWithThisPathExist(Image image); = + public List findAllUserComments(User user); + = + public void resetImage(Image imageo); + } \ No newline at end of file Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/IShelfAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IShelfAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/IShelfAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -43,4 +43,6 @@ void editShelf(Shelf shelf) throws PhotoAlbumException; = List getPredefinedShelves(); + + void resetShelf(Shelf shelf); } Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/ImageAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ImageAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ImageAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -36,6 +36,8 @@ import org.richfaces.photoalbum.domain.Comment; import org.richfaces.photoalbum.domain.Image; import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; /** * Class for manipulating with image entity. Analogous to DAO pattern. * EJB3 Bean @@ -157,10 +159,10 @@ */ public void deleteComment(Comment comment) throws PhotoAlbumException { try{ + Image image =3D comment.getImage(); em.remove(comment); + image.removeComment(comment); em.flush(); - - em.refresh(comment.getImage()); } catch(Exception e){ throw new PhotoAlbumException(e.getMessage()); @@ -228,4 +230,22 @@ .setParameter(Constants.ALBUM_PARAMETER, image.getAlbum()) .getResultList().size() !=3D 0; } + + /** + * Retrieve all cooments posted by given user. + * @return list of comments + */ + public List findAllUserComments(User user) { + return em.createNamedQuery(Constants.USER_COMMENTS_QUERY) + .setParameter(Constants.AUTHOR_PARAMETER, user) + .getResultList(); + } + = + /** + * Refresh state of given image + * @param image - image to Synchronize + */ + public void resetImage(Image image) { + em.refresh(image); + } } Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/= photoalbum/service/ShelfAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ShelfAction.java 2009-05-05 16:29:24 UTC (rev 14022) +++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoa= lbum/service/ShelfAction.java 2009-05-05 16:29:40 UTC (rev 14023) @@ -106,4 +106,12 @@ public List getPredefinedShelves() { return em.createNamedQuery(Constants.USER_SHELVES_QUERY).getResultList(); } + + /** + * Refresh state of given shelf + * @param shelf - shelf to Synchronize + */ + public void resetShelf(Shelf shelf) { + em.refresh(shelf); + } } \ No newline at end of file --===============2740555234980945753==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 13:35:48 2009 Content-Type: multipart/mixed; boundary="===============3148942792989316156==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14024 - in trunk/ui/componentControl/src/main: java/org/richfaces/component and 1 other directory. Date: Tue, 05 May 2009 13:33:03 -0400 Message-ID: --===============3148942792989316156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-05 13:33:02 -0400 (Tue, 05 May 2009) New Revision: 14024 Modified: trunk/ui/componentControl/src/main/config/component/componentControl.xml trunk/ui/componentControl/src/main/java/org/richfaces/component/UICompon= entControl.java Log: https://jira.jboss.org/jira/browse/RF-6275 Modified: trunk/ui/componentControl/src/main/config/component/componentCont= rol.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/componentControl/src/main/config/component/componentControl.xm= l 2009-05-05 16:29:40 UTC (rev 14023) +++ trunk/ui/componentControl/src/main/config/component/componentControl.xm= l 2009-05-05 17:33:02 UTC (rev 14024) @@ -37,6 +37,7 @@ Disable default action for target event ( append "return false;&q= uot; to JavaScript ) +       event Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/U= IComponentControl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/componentControl/src/main/java/org/richfaces/component/UICompo= nentControl.java 2009-05-05 16:29:40 UTC (rev 14023) +++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UICompo= nentControl.java 2009-05-05 17:33:02 UTC (rev 14024) @@ -21,7 +21,9 @@ = package org.richfaces.component; = +import javax.el.ELException; import javax.el.ValueExpression; +import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.component.UIParameter; @@ -51,6 +53,9 @@ = private static final Log log =3D LogFactory.getLog(UIComponentControl.= class); = + private boolean disableDefault =3D false; + private boolean disableDefaultSet =3D false; + = /** * @return JavaScript eventString. Rebuild on every call, since can be= in * loop ( as in dataTable ) with different parameters. @@ -137,6 +142,35 @@ = public abstract void setAttachTo(String value); = + public boolean isDisableDefault() { + if (this.disableDefaultSet) { + return (this.disableDefault); + } + = + ValueExpression ve =3D getValueExpression("disableDefault"); + if (ve !=3D null) { + Boolean value =3D null; + = + try { + value =3D (Boolean) ve.getValue(getFacesContext().getELContext()); + } catch (ELException e) { + throw new FacesException(e); + } + = + if (null !=3D value) { + return value.booleanValue(); + } + } + + String event =3D getEvent(); + return ("contextmenu".equalsIgnoreCase(event) || "oncontextmenu".equa= lsIgnoreCase(event)); + } + + public void setDisableDefault(boolean disableDefault) { + this.disableDefaultSet =3D true; + this.disableDefault =3D disableDefault; + } + = protected String replaceClientIds(FacesContext context, UIComponent component, String selector) { return HtmlUtil.expandIdSelector(selector, component, context); @@ -197,4 +231,22 @@ public abstract void setAttachTiming(String attachTiming); = public abstract String getAttachTiming(); + = + @Override + public Object saveState(FacesContext context) { + Object[] state =3D new Object[3]; + state[0] =3D super.saveState(context); + state[1] =3D this.disableDefault ? Boolean.TRUE : Boolean.FALSE; + state[2] =3D this.disableDefaultSet ? Boolean.TRUE : Boolean.FALSE; + + return state; + } + = + @Override + public void restoreState(FacesContext context, Object stateObject) { + Object[] state =3D (Object[]) stateObject; + super.restoreState(context, state[0]); + this.disableDefault =3D ((Boolean) state[1]).booleanValue(); + this.disableDefaultSet =3D ((Boolean) state[2]).booleanValue(); + } } --===============3148942792989316156==-- From richfaces-svn-commits at lists.jboss.org Tue May 5 18:31:21 2009 Content-Type: multipart/mixed; boundary="===============2587364647251952761==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14025 - in trunk: samples/layout-sample/src/main/webapp/pages and 9 other directories. Date: Tue, 05 May 2009 18:28:33 -0400 Message-ID: --===============2587364647251952761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-05 18:28:33 -0400 (Tue, 05 May 2009) New Revision: 14025 Added: trunk/ui/layout/src/main/java/org/richfaces/component/LayoutStructure.ja= va trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutPanelRe= nderer.java trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutRendere= r.java trunk/ui/layout/src/test/java/org/richfaces/component/ trunk/ui/layout/src/test/java/org/richfaces/component/LayoutStructureTes= t.java Removed: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPane= lRenderer.java trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRend= erer.java trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutBe= an.java trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml trunk/samples/themes/src/main/templates/org/richfaces/oldschool.jspx trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx trunk/ui/layout/src/main/config/component/layout.xml trunk/ui/layout/src/main/config/component/layoutPanel.xml trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simp= le.xcss Log: https://jira.jboss.org/jira/browse/RF-6602 https://jira.jboss.org/jira/browse/RF-6629 https://jira.jboss.org/jira/browse/RF-6713 https://jira.jboss.org/jira/browse/RF-6641 Modified: trunk/samples/layout-sample/src/main/java/org/richfaces/samples/L= ayoutBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutB= ean.java 2009-05-05 17:33:02 UTC (rev 14024) +++ trunk/samples/layout-sample/src/main/java/org/richfaces/samples/LayoutB= ean.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -22,7 +22,7 @@ = private boolean rendered =3D true; = - private float width; + private String width; = /** * @return the rendered @@ -41,14 +41,14 @@ /** * @return the width */ - public float getWidth() { + public String getWidth() { return width; } = /** * @param width the width to set */ - public void setWidth(float width) { + public void setWidth(String width) { this.width =3D width; } = Modified: trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/samples/themes/src/main/templates/org/richfaces/oldschool.j= spx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/templates/org/richfaces/oldschool.jspx 20= 09-05-05 17:33:02 UTC (rev 14024) +++ trunk/samples/themes/src/main/templates/org/richfaces/oldschool.jspx 20= 09-05-05 22:28:33 UTC (rev 14025) @@ -15,7 +15,6 @@ - #{component.attributes['pageTitle']} @@ -36,10 +35,11 @@ = - +
      + +
      -
      +
      @@ -48,15 +48,16 @@
      - +
      + - - +
      +
      		+ @@ -64,18 +65,20 @@
      -
      +
      Modified: trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx 2009-= 05-05 17:33:02 UTC (rev 14024) +++ trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx 2009-= 05-05 22:28:33 UTC (rev 14025) @@ -35,21 +35,24 @@ = - +
      Modified: trunk/ui/layout/src/main/config/component/layout.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/config/component/layout.xml 2009-05-05 17:33:0= 2 UTC (rev 14024) +++ trunk/ui/layout/src/main/config/component/layout.xml 2009-05-05 22:28:3= 3 UTC (rev 14025) @@ -11,9 +11,9 @@ - + org.richfaces.LayoutRenderer - + org.richfaces.renderkit.html.LayoutRenderer layout Modified: trunk/ui/layout/src/main/config/component/layoutPanel.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-05-05 17= :33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-05-05 22= :28:33 UTC (rev 14025) @@ -11,9 +11,9 @@ - + org.richfaces.LayoutPanelRenderer - + org.richfaces.renderkit.html.LayoutPanelRenderer layoutPanel @@ -38,7 +38,7 @@ = width - float + java.lang.String Sets the width of the layout area Added: trunk/ui/layout/src/main/java/org/richfaces/component/LayoutStructur= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/component/LayoutStructure.j= ava (rev 0) +++ trunk/ui/layout/src/main/java/org/richfaces/component/LayoutStructure.j= ava 2009-05-05 22:28:33 UTC (rev 14025) @@ -0,0 +1,291 @@ +/** + * = + */ +package org.richfaces.component; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; + +/** + * @author asmirnov + * = + */ +public class LayoutStructure implements Serializable { + /** + * = + */ + private static final long serialVersionUID =3D -5700775901583881224L; + + private UILayoutPanel top =3D null; + private UILayoutPanel bottom =3D null; + private UILayoutPanel left =3D null; + private UILayoutPanel right =3D null; + private UILayoutPanel center =3D null; + private int deep =3D 0; + private List columns; + + public LayoutStructure(UILayout layout) { + sortPanels(layout); + } + + public LayoutStructure(UILayoutPanel panel){ + UIComponent parent =3D panel.getParent(); + if (parent instanceof UILayout) { + UILayout layout =3D (UILayout) parent; + sortPanels(layout); + } else { + throw new FacesException("Layout panel should be children of UILayout p= omponent"); + } + } + + /** + * @param layout + * @throws FacesException + */ + public void sortPanels(UILayout layout) throws FacesException { + this.deep =3D layoutDeep(layout); + for (UIComponent child : layout.getChildren()) { + if (child instanceof UILayoutPanel && child.isRendered()) { + UILayoutPanel layoutPanel =3D (UILayoutPanel) child; + LayoutPosition position =3D layoutPanel.getPosition(); + if (LayoutPosition.top.equals(position)) { + if (null !=3D top) { + throw new FacesException( + "Duplicate layoutPanel's with same position" + + position); + } + top =3D layoutPanel; + } else if (LayoutPosition.bottom.equals(position)) { + if (null !=3D bottom) { + throw new FacesException( + "Duplicate layoutPanel's with same position" + + position); + } + bottom =3D layoutPanel; + } else if (LayoutPosition.left.equals(position)) { + if (null !=3D left) { + throw new FacesException( + "Duplicate layoutPanel's with same position" + + position); + } + left =3D layoutPanel; + } else if (LayoutPosition.right.equals(position)) { + if (null !=3D right) { + throw new FacesException( + "Duplicate layoutPanel's with same position" + + position); + } + right =3D layoutPanel; + } else if (null =3D=3D position + || LayoutPosition.center.equals(position)) { + if (null !=3D center) { + throw new FacesException( + "Duplicate layoutPanel's with same position" + + position); + } + center =3D layoutPanel; + } else { + + } + } + + } + // Reorganise central row. + if(null =3D=3D left && null !=3D center){ + left =3D center; + center =3D null; + } + if(null =3D=3D left && null !=3D right){ + left =3D right; + right =3D null; + } + if(null =3D=3D center && null !=3D right){ + center =3D right; + right =3D null; + } + this.columns =3D new ArrayList(3); + if(null !=3D left){ + columns.add(new Column(left)); + } + if(null !=3D center){ + columns.add(new Column(center)); + } + if(null !=3D right){ + columns.add(new Column(right)); + } + } + + /** + * @throws NumberFormatException + */ + public void calculateWidth() throws NumberFormatException { + // calculate widths. + if(getColumns()>0){ + float totalPercent =3D 0.0f; + int numOfPercentColumns =3D 0; + float totalPart =3D 0.0f; + int numOfPartColumns =3D 0; + // Collect width information. + for (Column column : columns) { + String width =3D column.panel.getWidth(); + if(null =3D=3D width || 0 =3D=3Dwidth.length()){ + column.partWidth =3D 1.0f; + totalPart +=3D column.partWidth; + numOfPartColumns++; + } else if(width.startsWith("*")){ + column.partWidth =3D Float.parseFloat(width.substring(1)); + totalPart +=3D column.partWidth; + numOfPartColumns++; + } else if(width.endsWith("%")) { + column.percentWidth =3D Float.parseFloat(width.substring(0,width.leng= th()-1)); + totalPercent +=3D column.percentWidth; + numOfPercentColumns++; + } = + } + float partToPercent=3D0.0f; + float percentCoefficient =3D 1.0f; + if(numOfPartColumns>0 && numOfPercentColumns >0){ + float rest =3D 100.00f - totalPercent; + partToPercent =3D rest/totalPart; + } else if(numOfPartColumns>0){ + partToPercent =3D 100.00f/totalPart; + } else if(numOfPercentColumns =3D=3D columns.size()){ + percentCoefficient =3D 100.00f/totalPercent; + } + // TODO - calculate precisious coefficient. + percentCoefficient*=3D0.98f; + // Recalculate width. + for (Column column : columns) { + if(column.partWidth>0.0f){ + column.percentWidth =3D column.partWidth*partToPercent; + } + column.percentWidth =3D column.percentWidth*percentCoefficient; + } + } + } + + /** + * @return the top + */ + public UILayoutPanel getTop() { + return top; + } + + /** + * @return the bottom + */ + public UILayoutPanel getBottom() { + return bottom; + } + + /** + * @return the left + */ + public UILayoutPanel getLeft() { + return left; + } + + /** + * @return the right + */ + public UILayoutPanel getRight() { + return right; + } + + /** + * @return the center + */ + public UILayoutPanel getCenter() { + return center; + } + + /** + * @return the columns + */ + public int getColumns() { + return columns.size(); + } + = + /** + */ + public String getWidth(UILayoutPanel panel){ + return getWidth(panel,1.0f); + } + + /** + * @param panel + * @param coeeficient + * @return + */ + public String getWidth(UILayoutPanel panel, float coeeficient){ + if(this.top =3D=3D panel || this.bottom =3D=3D panel){ + return panel.getWidth(); + } else { + for (Column column : columns) { + if(column.panel =3D=3D panel){ + if(column.percentWidth>0){ + return String.format((Locale)null, "%2.2f%%", column.percentWidth*co= eeficient); + } else { + return panel.getWidth(); + } + } + } + } + return null; + } + = + /** + * Calculate deep of layout components. + * @param component + * @return + */ + protected int layoutDeep(UIComponent component) { + int deep =3D 0; + if(null !=3D component){ + deep =3D layoutDeep(component.getParent()); + if(component instanceof UILayout){ + deep++; + } + } + return deep; + } + + = + static class Column { + private final UILayoutPanel panel; + private float percentWidth =3D 0.0f; + private float partWidth =3D 0.0f; + = + public Column(UILayoutPanel panel) { + this.panel =3D panel; + } + = + public String getWidth(){ + if(percentWidth>0.0f){ + return String.format((Locale)null, "%2.2f%%", percentWidth); + } else { + return panel.getWidth(); + } + } + + /** + * @return the percentWidth + */ + public float getPercentWidth() { + return percentWidth; + } + } + + + /** + * @return the deep + */ + public int getDeep() { + return deep; + } +} Property changes on: trunk/ui/layout/src/main/java/org/richfaces/component/= LayoutStructure.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPan= el.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.jav= a 2009-05-05 17:33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.jav= a 2009-05-05 22:28:33 UTC (rev 14025) @@ -33,13 +33,13 @@ * Get Panel width. * @return */ - public abstract float getWidth(); + public abstract String getWidth(); = /** * Set Panel width. * @param newvalue */ - public abstract void setWidth(float newvalue); + public abstract void setWidth(String newvalue); = = } Deleted: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayo= utPanelRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPan= elRenderer.java 2009-05-05 17:33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutPan= elRenderer.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -1,66 +0,0 @@ -/** - * = - */ -package org.richfaces.renderkit; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; -import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.component.LayoutPosition; -import org.richfaces.component.UILayout; -import org.richfaces.component.UILayoutPanel; - -/** - * @author asmirnov - * - */ -public abstract class AbstractLayoutPanelRenderer extends - HeaderResourcesRendererBase { - = - public String layoutStyle(FacesContext context, UILayoutPanel panel) { - StringBuilder style =3D new StringBuilder(); - LayoutPosition position =3D panel.getPosition(); - Object componentStyle =3D panel.getAttributes().get(HTML.style_ATTRIBUTE= ); - if(null !=3D componentStyle){ - style.append(componentStyle).append(";"); - } - if(!LayoutPosition.top.equals(position)&&!LayoutPosition.bottom.equals(p= osition)){ - if(LayoutPosition.right.equals(position)){ - style.append("float:right;"); - } else { - style.append("float:left;"); = - } - // find siblings. - // get layout depth. - int deep =3D layoutDeep(panel); - // calculate real width. - float width =3D panel.getWidth(); - if(width>=3D0.0f){ - style.append("width:").append(width).append("%;"); - width =3D width/(1.0f+(float)deep); - style.append("*width:").append(width).append("%;"); - } - } else { - // top and buttom style. - } - return style.length()>0?style.toString():null; - } - - /** - * Calculate deep of layout components. - * @param component - * @return - */ - private int layoutDeep(UIComponent component) { - int deep =3D 0; - if(null !=3D component){ - deep =3D layoutDeep(component.getParent()); - if(component instanceof UILayout){ - deep++; - } - } - return deep; - } -} Deleted: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayo= utRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRen= derer.java 2009-05-05 17:33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRen= derer.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -1,109 +0,0 @@ -/** - * = - */ -package org.richfaces.renderkit; - -import java.io.IOException; -import java.util.Map; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; -import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.component.LayoutPosition; -import org.richfaces.component.UILayout; -import org.richfaces.component.UILayoutPanel; - -/** - * @author asmirnov - * = - */ -public abstract class AbstractLayoutRenderer extends - HeaderResourcesRendererBase { - - public void renderLayout(FacesContext context, UILayout layout) - throws IOException { - // Detect layout content; - UILayoutPanel top =3D null; - UILayoutPanel bottom =3D null; - UILayoutPanel left =3D null; - UILayoutPanel right =3D null; - UILayoutPanel center =3D null; - int columns =3D 0; - for (UIComponent child : layout.getChildren()) { - if (child instanceof UILayoutPanel && child.isRendered()) { - UILayoutPanel layoutPanel =3D (UILayoutPanel) child; - LayoutPosition position =3D layoutPanel.getPosition(); - if (LayoutPosition.top.equals(position)) { - if (null !=3D top) { - throw new FacesException( - "Duplicate layoutPanel's with same position" - + position); - } - top =3D layoutPanel; - } else if (LayoutPosition.bottom.equals(position)) { - if (null !=3D bottom) { - throw new FacesException( - "Duplicate layoutPanel's with same position" - + position); - } - bottom =3D layoutPanel; - } else if (LayoutPosition.left.equals(position)) { - if (null !=3D left) { - throw new FacesException( - "Duplicate layoutPanel's with same position" - + position); - } - left =3D layoutPanel; - columns++; - } else if (LayoutPosition.right.equals(position)) { - if (null !=3D right) { - throw new FacesException( - "Duplicate layoutPanel's with same position" - + position); - } - right =3D layoutPanel; - columns++; - } else if (null =3D=3D position - || LayoutPosition.center.equals(position)) { - if (null !=3D center) { - throw new FacesException( - "Duplicate layoutPanel's with same position" - + position); - } - center =3D layoutPanel; - columns++; - } else { - - } - } - } - ResponseWriter writer =3D context.getResponseWriter(); - if (null !=3D top) { - top.encodeAll(context); - } - if (columns > 0) { - // Reorder panels to fill ordeg left->center->right. - if (null !=3D left) { - left.encodeAll(context); - } = - if (null !=3D center) { - center.encodeAll(context); - } = - if (null !=3D right) { - right.encodeAll(context); - } = - } - // line separator. - writer.startElement(HTML.DIV_ELEM, layout); - writer.writeAttribute(HTML.style_ATTRIBUTE, "display: block; height: 0; = clear: both; visibility: hidden;", null); - writer.writeText(".", null); - writer.endElement(HTML.DIV_ELEM); - if (null !=3D bottom) { - renderChild(context, bottom); - } - } -} Copied: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutPa= nelRenderer.java (from rev 14023, trunk/ui/layout/src/main/java/org/richfac= es/renderkit/AbstractLayoutPanelRenderer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutPanelR= enderer.java (rev 0) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutPanelR= enderer.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -0,0 +1,91 @@ +/** + * = + */ +package org.richfaces.renderkit.html; + +import java.io.IOException; +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.renderkit.RendererBase; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.LayoutPosition; +import org.richfaces.component.LayoutStructure; +import org.richfaces.component.UILayout; +import org.richfaces.component.UILayoutPanel; + +/** + * @author asmirnov + * = + */ +public class LayoutPanelRenderer extends RendererBase { + private static final Object[] LAYOUT_EXCLUSIONS =3D { HTML.id_ATTRIBUTE, + HTML.style_ATTRIBUTE }; + + @Override + protected void doEncodeBegin(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.startElement(HTML.DIV_ELEM, component); + getUtils().encodeCustomId(context, component); + getUtils().encodePassThruWithExclusionsArray(context, component, + LAYOUT_EXCLUSIONS); + String layoutStyle =3D layoutStyle(context, (UILayoutPanel) component); + if (null !=3D layoutStyle) { + writer.writeAttribute(HTML.style_ATTRIBUTE, layoutStyle, "style"); + + } + } + + public String layoutStyle(FacesContext context, UILayoutPanel panel) { + StringBuilder style =3D new StringBuilder(); + LayoutPosition position =3D panel.getPosition(); + Map requestMap =3D context.getExternalContext().getReque= stMap(); + Object parentLayout =3D requestMap.get(LayoutRenderer.LAYOUT_STRUCTURE_A= TTRIBUTE); + LayoutStructure structure; + if (null !=3D parentLayout && parentLayout instanceof LayoutStructure) { + structure =3D (LayoutStructure) parentLayout; = + } else { + structure =3D new LayoutStructure(panel); + structure.calculateWidth(); + } + Object componentStyle =3D panel.getAttributes().get(HTML.style_ATTRIBUTE= ); + if (null !=3D componentStyle) { + style.append(componentStyle).append(";"); + } + if (!LayoutPosition.top.equals(position) + && !LayoutPosition.bottom.equals(position)) { + if (LayoutPosition.right.equals(position)) { + style.append("float:right;"); + } else { + style.append("float:left;"); + } + // calculate real width. + float coef =3D 1.0f-((float)structure.getDeep()/100.00f); + String width =3D structure.getWidth(panel,coef); + if(null !=3D width){ + style.append("width:").append(width).append(";"); + coef =3D coef*0.95f; + width =3D structure.getWidth(panel,coef);; + style.append("*width:").append(width).append(";"); + } + } else { + // top and buttom style. + } + return style.length() > 0 ? style.toString() : null; + } + + @Override + protected void doEncodeEnd(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.endElement(HTML.DIV_ELEM); + } + + @Override + protected Class getComponentClass() { + return UILayoutPanel.class; + } +} Property changes on: trunk/ui/layout/src/main/java/org/richfaces/renderkit/= html/LayoutPanelRenderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutRe= nderer.java (from rev 14023, trunk/ui/layout/src/main/java/org/richfaces/re= nderkit/AbstractLayoutRenderer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutRender= er.java (rev 0) +++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/LayoutRender= er.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -0,0 +1,97 @@ +/** + * = + */ +package org.richfaces.renderkit.html; + +import java.io.IOException; +import java.util.Map; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.renderkit.RendererBase; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.LayoutPosition; +import org.richfaces.component.LayoutStructure; +import org.richfaces.component.UILayout; +import org.richfaces.component.UILayoutPanel; + +/** + * @author asmirnov + * = + */ +public class LayoutRenderer extends + RendererBase { + = + public static final String LAYOUT_STRUCTURE_ATTRIBUTE =3D UILayout.class.= getName()+".structure"; + private static final Object[] LAYOUT_EXCLUSIONS =3D {HTML.id_ATTRIBUTE,HT= ML.style_ATTRIBUTE}; + @Override + protected void doEncodeBegin(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.startElement(HTML.DIV_ELEM, component); + getUtils().encodeCustomId(context, component); + getUtils().encodePassThruWithExclusionsArray(context, component, LAYOUT_= EXCLUSIONS); + Object style =3D component.getAttributes().get("style"); + writer.writeAttribute(HTML.style_ATTRIBUTE,null=3D=3Dstyle?"":(style.toS= tring()+";")+"zoom:1;","style"); + } + + = + @Override + protected void doEncodeChildren(ResponseWriter writer, + FacesContext context, UIComponent component) throws IOException { + renderLayout(writer,context, (UILayout) component); + } + = + public void renderLayout(ResponseWriter writer,FacesContext context, UILa= yout layout) + throws IOException { + LayoutStructure structure =3D new LayoutStructure(layout); + structure.calculateWidth(); + Map requestMap =3D context.getExternalContext().getReque= stMap(); + Object oldLayout =3D requestMap.get(LAYOUT_STRUCTURE_ATTRIBUTE); + requestMap.put(LAYOUT_STRUCTURE_ATTRIBUTE, structure); + // Detect layout content; + if (null !=3D structure.getTop()) { + structure.getTop().encodeAll(context); + } + if (structure.getColumns() > 0) { + // Reorder panels to fill ordeg left->center->right. + if (null !=3D structure.getLeft()) { + structure.getLeft().encodeAll(context); + } = + if (null !=3D structure.getCenter()) { + structure.getCenter().encodeAll(context); + } = + if (null !=3D structure.getRight()) { + structure.getRight().encodeAll(context); + } = + } + // line separator. + writer.startElement(HTML.DIV_ELEM, layout); + writer.writeAttribute(HTML.style_ATTRIBUTE, "display: block; height: 0; = clear: both; visibility: hidden;", null); + writer.writeText(".", null); + writer.endElement(HTML.DIV_ELEM); + if (null !=3D structure.getBottom()) { + renderChild(context, structure.getBottom()); + } + requestMap.put(LAYOUT_STRUCTURE_ATTRIBUTE, oldLayout); + } + = + @Override + protected void doEncodeEnd(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.endElement(HTML.DIV_ELEM); + } + + @Override + public boolean getRendersChildren() { + return true; + } + = + @Override + protected Class getComponentClass() { + return UILayout.class; + } +} Property changes on: trunk/ui/layout/src/main/java/org/richfaces/renderkit/= html/LayoutRenderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/c= ss/simple.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/sim= ple.xcss 2009-05-05 17:33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/sim= ple.xcss 2009-05-05 22:28:33 UTC (rev 14025) @@ -34,6 +34,13 @@ + + + + + + + = - -
      - - - - -
      - \ No newline at end of file Deleted: trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.j= spx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2= 009-05-05 17:33:02 UTC (rev 14024) +++ trunk/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2= 009-05-05 22:28:33 UTC (rev 14025) @@ -1,22 +0,0 @@ - - - -
      - - - -
      -       \ No newline at end of file Added: trunk/ui/layout/src/test/java/org/richfaces/component/LayoutStructur= eTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/layout/src/test/java/org/richfaces/component/LayoutStructureTe= st.java (rev 0) +++ trunk/ui/layout/src/test/java/org/richfaces/component/LayoutStructureTe= st.java 2009-05-05 22:28:33 UTC (rev 14025) @@ -0,0 +1,86 @@ +package org.richfaces.component; + +import java.util.List; + +import javax.faces.component.UIComponent; + +import org.richfaces.component.html.HtmlLayout; +import org.richfaces.component.html.HtmlLayoutPanel; + +import junit.framework.TestCase; + +public class LayoutStructureTest extends TestCase { + = + protected UILayout createLayout(String leftWidth,String centerWidth,Strin= g rightWidth) { + UILayout layout =3D new HtmlLayout(); + layout.setId("layout"); + List children =3D layout.getChildren(); + UILayoutPanel panel =3D new HtmlLayoutPanel(); + panel.setPosition(LayoutPosition.left); + panel.setId("left"); + panel.setWidth(leftWidth); + children.add(panel); + = + panel =3D new HtmlLayoutPanel(); + panel.setPosition(LayoutPosition.top); + panel.setId("top"); + children.add(panel); + = + panel =3D new HtmlLayoutPanel(); + panel.setPosition(LayoutPosition.right); + panel.setId("right"); + panel.setWidth(rightWidth); + children.add(panel); + = + panel =3D new HtmlLayoutPanel(); + panel.setPosition(LayoutPosition.center); + panel.setId("center"); + panel.setWidth(centerWidth); + children.add(panel); = + = + panel =3D new HtmlLayoutPanel(); + panel.setPosition(LayoutPosition.bottom); + panel.setId("bottom"); + children.add(panel); + return layout; + } + + public void testSortPanels() throws Exception { + LayoutStructure struct =3D new LayoutStructure(createLayout(null, null, = null)); + assertEquals("top", struct.getTop().getId()); + assertEquals("bottom", struct.getBottom().getId()); + assertEquals("left", struct.getLeft().getId()); + assertEquals("right", struct.getRight().getId()); + assertEquals("center", struct.getCenter().getId()); + } + = + public void testCalculateWidth() throws Exception { + LayoutStructure struct =3D new LayoutStructure(createLayout(null, null, = null)); + struct.calculateWidth(); + assertEquals("32.67%", struct.getWidth(struct.getLeft())); + assertEquals("32.67%", struct.getWidth(struct.getCenter())); + assertEquals("32.67%", struct.getWidth(struct.getRight())); + } + + public void testCalculateWidth1() throws Exception { + LayoutStructure struct =3D new LayoutStructure(createLayout("50%", null,= null)); + struct.calculateWidth(); + assertEquals("49.00%", struct.getWidth(struct.getLeft())); + assertEquals("24.50%", struct.getWidth(struct.getCenter())); + assertEquals("24.50%", struct.getWidth(struct.getRight())); + } + public void testCalculateWidth2() throws Exception { + LayoutStructure struct =3D new LayoutStructure(createLayout("50%", "*2",= "*1")); + struct.calculateWidth(); + assertEquals("49.00%", struct.getWidth(struct.getLeft())); + assertEquals("32.67%", struct.getWidth(struct.getCenter())); + assertEquals("16.33%", struct.getWidth(struct.getRight())); + } + public void testCalculateWidth3() throws Exception { + LayoutStructure struct =3D new LayoutStructure(createLayout("50%", "20%"= , "10%")); + struct.calculateWidth(); + assertEquals("61.25%", struct.getWidth(struct.getLeft())); + assertEquals("24.50%", struct.getWidth(struct.getCenter())); + assertEquals("12.25%", struct.getWidth(struct.getRight())); + } +} Property changes on: trunk/ui/layout/src/test/java/org/richfaces/component/= LayoutStructureTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============2587364647251952761==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 04:22:51 2009 Content-Type: multipart/mixed; boundary="===============8846073665193223466==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14026 - trunk/framework/impl/src/main/java/org/richfaces. Date: Wed, 06 May 2009 04:19:57 -0400 Message-ID: --===============8846073665193223466== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-06 04:19:57 -0400 (Wed, 06 May 2009) New Revision: 14026 Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java Log: change SVN revision and date Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-= 05-05 22:28:33 UTC (rev 14025) +++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-= 05-06 08:19:57 UTC (rev 14026) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ = -package org.richfaces; +package org.richfaces; = = /** * Vendor and version information for A4J project --===============8846073665193223466==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 04:46:28 2009 Content-Type: multipart/mixed; boundary="===============4758710354518233406==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14027 - trunk/examples/photoalbum/source/web/src/main/webapp/img/shell. Date: Wed, 06 May 2009 04:43:35 -0400 Message-ID: --===============4758710354518233406== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: amarkhel Date: 2009-05-06 04:43:34 -0400 (Wed, 06 May 2009) New Revision: 14027 Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/shell/icon_add_= album_disabled.jpg trunk/examples/photoalbum/source/web/src/main/webapp/img/shell/icon_add_= photo_disabled.jpg Log: Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/shell/icon_= add_album_disabled.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/src/main/webapp/i= mg/shell/icon_add_album_disabled.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/shell/icon_= add_photo_disabled.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/src/main/webapp/i= mg/shell/icon_add_photo_disabled.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg --===============4758710354518233406==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 07:46:21 2009 Content-Type: multipart/mixed; boundary="===============2161097370379971474==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14028 - trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo. Date: Wed, 06 May 2009 07:43:26 -0400 Message-ID: --===============2161097370379971474== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-06 07:43:25 -0400 (Wed, 06 May 2009) New Revision: 14028 Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/mojo/ResourceDependencyMojo.java Log: fix generated resource output Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/mojo/ResourceDependencyMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-06 08:43:34 UTC (rev 14027) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-06 11:43:25 UTC (rev 14028) @@ -22,7 +22,6 @@ = import java.io.File; import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; import java.util.Collection; import java.util.Collections; @@ -69,8 +68,8 @@ /** * @author Anton Belevich * @goal assembly-resources - * @phase process-resources = - = + * @phase generate-resources + * = */ public class ResourceDependencyMojo extends AbstractMojo { = @@ -122,28 +121,34 @@ private File webSourceDirectory; = /** - * outputScriptDirectory = - * @parameter expression =3D "${basedir}/src/main/webapp/WEB-INF/classes= " = + * outputScriptDirectory + * @parameter expression=3D"${project.build.directory}/generated-resourc= es/script" */ private File outputScriptDirectory ; = /** - * scriptFileName + * scriptFilePath * @parameter expression=3D"custom-dependencies" */ - private String scriptFileName; + private String scriptFilePath; = /** * outputStyleDirectory = - * @parameter expression =3D "${basedir}/src/main/webapp/WEB-INF/classes= " = + * @parameter expression=3D"${project.build.directory}/generated-resourc= es/styles" */ private File outputStyleDirectory; = /** - * styleFileName + * outputResourceDirectory + * @parameter expression=3D"${project.build.directory}/generated-resources + * = + */ + private File outputResourceDirectory; + /** + * styleFilePath * @parameter expression=3D"custom-dependencies" */ - private String styleFileName; + private String styleFilePath; = /** * beforeScriptIncludes @@ -269,43 +274,45 @@ = Set scripts =3D handler.getScripts(); = - File scriptFile =3D new File(outputScriptDirectory, scriptFileName + "= .js"); - = + scriptFilePath =3D scriptFilePath.endsWith(".js") ? scriptFilePath : s= criptFilePath + ".js"; = + File scriptFile =3D new File(outputResourceDirectory, scriptFilePath); + if(!scriptFile.exists()) { + scriptFile.mkdirs(); + } = + = + ScriptAssembler scriptAssembler =3D new ScriptAssembler(); + = + getLog().info("Start merge scripts to the: " + scriptFile.getPath()); + = if(!scripts.isEmpty()) { - = - if(!outputScriptDirectory.exists()) { - outputScriptDirectory.mkdirs(); - } - - ScriptAssembler scriptAssembler =3D new ScriptAssembler(); - mergeResources(scriptFile, scriptAssembler, beforeScriptIncludes, aft= erScriptIncludes, scripts); - = - } else if(scriptFile.exists()) { - scriptFile.delete(); - } - = + mergeResources(scriptFile,scriptAssembler, beforeScriptIncludes, afte= rScriptIncludes, scripts); + } = + = Set styles =3D handler.getStyles(); = - File styleFile =3D new File(outputStyleDirectory, styleFileName + ".xc= ss"); + styleFilePath =3D styleFilePath.endsWith(".xcss") ? styleFilePath : st= yleFilePath + ".xcss"; = = + File styleFile =3D new File(outputResourceDirectory, styleFilePath); + if(!styleFile.exists()) { + styleFile.mkdirs(); + } = + StyleAssembler styleAssembler =3D new StyleAssembler(); + styleAssembler.setVelocityComponent(velocity); + getLog().info("Start merge styles to the: " + styleFile.getPath()); + = if(!styles.isEmpty()) { - = - if(!outputStyleDirectory.exists()) { - outputStyleDirectory.mkdirs(); - } - = - StyleAssembler styleAssembler =3D new StyleAssembler(); - styleAssembler.setVelocityComponent(velocity); - mergeResources(styleFile, styleAssembler, beforeStyleIncludes, afterS= tyleIncludes, styles); - = - } else if(styleFile.exists()) { - styleFile.delete(); - } + mergeResources(styleFile,styleAssembler, beforeStyleIncludes, afterSt= yleIncludes, styles); + } = + = + Resource resource =3D new Resource(); + resource.setDirectory(outputResourceDirectory.getPath()); + project.addResource(resource); } = Thread.currentThread().setContextClassLoader(oldClassLoader); = } catch (Exception e) { + getLog().error("Error generate resource", e); throw new MojoExecutionException(e.getMessage(),e); } = = @@ -406,7 +413,7 @@ = try { FileSystemManager manager =3D VFS.getManager(); - jarFileObjects =3D manager.resolveFile("jar:" + file.getAbsolutePath()= ); + jarFileObjects =3D manager.resolveFile("jar:///" + file.getAbsolutePat= h()); } catch (FileSystemException e) { getLog().error("Error during processing file: " + file.getAbsolutePath= ()+ "\n" + e.getMessage(), e); } --===============2161097370379971474==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 07:46:49 2009 Content-Type: multipart/mixed; boundary="===============5938925452789082295==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14029 - trunk/sandbox/samples/maven-rd-plugin-sample. Date: Wed, 06 May 2009 07:43:54 -0400 Message-ID: --===============5938925452789082295== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-06 07:43:54 -0400 (Wed, 06 May 2009) New Revision: 14029 Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml Log: Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-06 11:43:2= 5 UTC (rev 14028) +++ trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-06 11:43:5= 4 UTC (rev 14029) @@ -10,6 +10,15 @@ war maven-rd-plugin-sample Maven Webapp 3.3.1-SNAPSHOT + = + + + jboss central + Maven Plugin Repository + http://repository.jboss.org/maven2 + + + = maven-rd-plugin-sample @@ -20,45 +29,23 @@ 1.5 + = maven-resource-dependency-plugin org.richfaces.cdk 3.3.1-SNAPSHOT - ${basedir}/src/main/webapp - = - - foo/scripts/before.js - scripts/test/test.js - - = - - foo/scripts/after.js - - = - - foo/styles/before.xcss - foo/styles/before.css - - = - - foo/styles/after.xcss - foo/styles/after.css - - = - = - http://richfaces.org/a4j - = - = - + styles/all.js + scripts/all.xcss + - process-resources + generate-resources assembly-resources - + --===============5938925452789082295==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 08:21:10 2009 Content-Type: multipart/mixed; boundary="===============2131688383372727368==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14030 - in trunk/samples/richfaces-demo/src/main: webapp/images and 1 other directory. Date: Wed, 06 May 2009 08:18:15 -0400 Message-ID: --===============2131688383372727368== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-06 08:18:15 -0400 (Wed, 06 May 2009) New Revision: 14030 Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_ColorPicker.gif trunk/samples/richfaces-demo/src/main/webapp/images/cn_SemanticLayoutCom= ponents.gif trunk/samples/richfaces-demo/src/main/webapp/images/ico_ColorPicker.gif trunk/samples/richfaces-demo/src/main/webapp/images/ico_SemanticLayoutCo= mponents.gif Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/commo= n/components.properties Log: https://jira.jboss.org/jira/browse/RF-7001 Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/dem= o/common/components.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-06 11:43:54 UTC (rev 14029) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/comm= on/components.properties 2009-05-06 12:18:15 UTC (rev 14030) @@ -92,4 +92,4 @@ editor=3DrichInputs, Editor, /images/ico_Editor.gif, = /images/cn_Editor.gif, editor.html, = jbossrichfaces/freezone/docs/tlddoc/rich/editor.html,= jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEdi= tor.html, /richfaces/editor.jsf queue=3DajaxSupport, Queue, /images/ico_common.gif, = /images/cn_Queue.gif, Queue.html, = jbossrichfaces/freezone/docs/tlddoc/rich/queue.html, = jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIQueue.h= tml, /richfaces/queue.jsf colorPicker=3D richInputs, Color Picker, /images/ico_ColorPic= ker.gif, /images/cn_ColorPicker.gif, ColorPicke= r.html, jbossrichfaces/freezone/do= cs/tlddoc/rich/colorPicker.html, jbossrichfaces/freezone/docs/apid= oc/org/richfaces/component/UIColorPicker.html, /richfaces/= colorPicker.jsf, new -layouts=3DrichMisc, Semantic Layouts, /images/ico_Layouts.gif, = /images/cn_Layouts.gif, Layouts.html, = jbossrichfaces/freezone/docs/tlddoc/rich/Pag= e.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/componen= t/UIPage.html, /richfaces/layouts.jsf, new \ No newline at end of file +layouts=3DrichMisc, Semantic Layouts, /images/ico_SemanticLayout= Components.gif, /images/cn_SemanticLayoutComponents.gif, = Layouts.html, jbossrichf= aces/freezone/docs/tlddoc/rich/Page.html, jbossrichfaces/freezone/= docs/apidoc/org/richfaces/component/UIPage.html, /richface= s/layouts.jsf, new \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_ColorPicker.g= if =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn= _ColorPicker.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_SemanticLayou= tComponents.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn= _SemanticLayoutComponents.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/ico_ColorPicker.= gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/ic= o_ColorPicker.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/ico_SemanticLayo= utComponents.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/ic= o_SemanticLayoutComponents.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============2131688383372727368==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 08:34:24 2009 Content-Type: multipart/mixed; boundary="===============5087267785759438966==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14031 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable. Date: Wed, 06 May 2009 08:31:28 -0400 Message-ID: --===============5087267785759438966== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-06 08:31:28 -0400 (Wed, 06 May 2009) New Revision: 14031 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifia= bleModel.xhtml Log: https://jira.jboss.org/jira/browse/RF-7015 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/= modifiableModel.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-06 12:18:15 UTC (rev 14030) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/modifi= ableModel.xhtml 2009-05-06 12:31:28 UTC (rev 14031) @@ -17,6 +17,9 @@ method is called with lists of sort and filter fields as parameters an= d should perform sorting and = filtering according to the fields. =

      +

      Note that = + filtering in this sample uses contains instead of startsWith= conditions. +

      =
      = @@ -30,7 +33,7 @@ = -
      = + \ No newline at end of file --===============5087267785759438966==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 08:43:08 2009 Content-Type: multipart/mixed; boundary="===============7076379239748898542==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14032 - trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo. Date: Wed, 06 May 2009 08:40:11 -0400 Message-ID: --===============7076379239748898542== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-06 08:40:11 -0400 (Wed, 06 May 2009) New Revision: 14032 Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/mojo/ResourceDependencyMojo.java Log: Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/mojo/ResourceDependencyMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-06 12:31:28 UTC (rev 14031) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-06 12:40:11 UTC (rev 14032) @@ -121,22 +121,11 @@ private File webSourceDirectory; = /** - * outputScriptDirectory - * @parameter expression=3D"${project.build.directory}/generated-resourc= es/script" - */ - private File outputScriptDirectory ; - = - /** * scriptFilePath * @parameter expression=3D"custom-dependencies" */ private String scriptFilePath; = - /** - * outputStyleDirectory = - * @parameter expression=3D"${project.build.directory}/generated-resourc= es/styles" - */ - private File outputStyleDirectory; = /** * outputResourceDirectory --===============7076379239748898542==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 09:46:12 2009 Content-Type: multipart/mixed; boundary="===============7820538765536003578==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14033 - in trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory. Date: Wed, 06 May 2009 08:46:12 -0400 Message-ID: --===============7820538765536003578== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: pyaschenko Date: 2009-05-06 08:46:12 -0400 (Wed, 06 May 2009) New Revision: 14033 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css= /modalPanel.xcss trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scr= ipts/modalPanel.js Log: https://jira.jboss.org/jira/browse/RF-6968 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/h= tml/css/modalPanel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/cs= s/modalPanel.xcss 2009-05-06 12:40:11 UTC (rev 14032) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/cs= s/modalPanel.xcss 2009-05-06 12:46:12 UTC (rev 14033) @@ -132,7 +132,6 @@ position: absolute; height: 100%; width: 100%; - border : 1px solid; z-index: -1; top: 4px; left: 4px; @@ -171,7 +170,6 @@ = - = Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/h= tml/scripts/modalPanel.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/sc= ripts/modalPanel.js 2009-05-06 12:40:11 UTC (rev 14032) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/sc= ripts/modalPanel.js 2009-05-06 12:46:12 UTC (rev 14033) @@ -648,7 +648,6 @@ } = element.style.visibility =3D "hidden"; - = Element.show(element); this.correctShadowSize(); = @@ -1060,7 +1059,7 @@ Richfaces.showModalPanel =3D function (id, opts, event) { = var invoke =3D = - (RichFaces.MSIE =3D=3D RichFaces.navigatorType()) ? + (Richfaces.browser.isIE || Richfaces.browser.isSafari) ? function(f) { if (document.readyState !=3D "complete") { var args =3D arguments; --===============7820538765536003578==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 10:02:43 2009 Content-Type: multipart/mixed; boundary="===============5842145492594903064==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14034 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js. Date: Wed, 06 May 2009 09:59:46 -0400 Message-ID: --===============5842145492594903064== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: pyaschenko Date: 2009-05-06 09:59:46 -0400 (Wed, 06 May 2009) New Revision: 14034 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/F= ileUpload.js Log: https://jira.jboss.org/jira/browse/RF-7029 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/ht= ml/js/FileUpload.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/= FileUpload.js 2009-05-06 12:46:12 UTC (rev 14033) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/= FileUpload.js 2009-05-06 13:59:46 UTC (rev 14034) @@ -523,16 +523,15 @@ return this.fileEntryWidth; } var w; - if (this.element.getWidth() !=3D 0) { - w =3D this.element.getWidth() - 122; - } else { = - w =3D this.element.style.width - 122; - } + w =3D this.element.offsetWidth - 122; + if (w<0) w =3D 0; this.fileEntryWidth =3D w; var progressW =3D this._progressBar.style.width; if (progressW =3D=3D "") { progressW =3D 200; } if (progressW > this.fileEntryWidth) { - w =3D (w - 2) + "px"; + w =3D (w - 2); + if (w<0) w=3D0; + w +=3D "px"; this._progressBar.style.width =3D w; var r =3D $(this._progressBar.id + ":remain"); if (r) { --===============5842145492594903064==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 10:34:44 2009 Content-Type: multipart/mixed; boundary="===============4225163476390598085==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14035 - trunk/docs/realworld_app_guide/en/src/main/docbook/includes. Date: Wed, 06 May 2009 10:31:47 -0400 Message-ID: --===============4225163476390598085== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: atsebro Date: 2009-05-06 10:31:47 -0400 (Wed, 06 May 2009) New Revision: 14035 Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/albumView.xml trunk/docs/realworld_app_guide/en/src/main/docbook/includes/navigationPa= nel.xml trunk/docs/realworld_app_guide/en/src/main/docbook/includes/uploadImages= .xml Log: RF-5768: Real World Demo Application Tutorial Update for 3.3.1 release: upd= ating guide Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/album= View.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/src/main/docbook/includes/albumView.x= ml 2009-05-06 13:59:46 UTC (rev 14034) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/includes/albumView.x= ml 2009-05-06 14:31:47 UTC (rev 14035) @@ -14,11 +14,11 @@ The component is included into the page with the help of= ui:include: + ...]]> = = - Now let's have a look at src/main/webapp/includes/= misc/inputNumberSlider.xhtml file: + Now let's have a look at src/main/webapp/includes/= image/inputNumberSlider.xhtml file: @@ -37,73 +37,92 @@ ...]]> = - On each slider position change the a4j:support component invokes an Ajax = request that passes a new set value into the ImageSizeHelper.java class. = - This class saves new photo dimensions, processes and a= ssigns new values to photo related attributes (a CSS class for new photo si= ze, postfix for a new file name, image background): + There is special Enumeration type that contains four p= redefined values for image size. Each type has a set of image related attri= butes such as CSS class for new photo size, postfix for a new file name, im= age background. + The setValue method of the ImageSiz= eHelper.java class is triggered on each slider's position change. Th= is method sets one of four predefined values for image size and due to slid= er's position. = + = + = + + And here is the ImageDimension.java class: + + = - = - - After the ImageSizeHelper.java is wor= ked out the a4j:support component renders user photos = + = + + After the <a4j:support>= is worked out user photos = (more exactly, the h:panelGroup with userAlbumImages id = that contains user photos) = - correspondingly to a new set value. Here is = web/src/main/webapp/includes/image/imageList.xhtml: + are rendered correspondingly to a new set value. H= ere is web/src/main/webapp/includes/image/imageList.xhtml: = - - - - - - = - - - - - - - - - - -
      -       -       = - #{image.name} = - - - - - = -       -       - = + + + + + + = + + + + + + + +
      +       + + + + + = +       = + #{image.name}<= /h:panelGroup> = + + + + + = + +       + = ...]]>       = @@ -118,6 +137,25 @@ + + Vizit following pages at RichFaces Live Demo for more informa= tion, examples and sources on the components used in the application and de= scribed in this chapter: + + = + + + + InputNumberSl= ider page for the <rich:inputN= umberSlider> component; + = + + = + + + AjaxSupport for the <a4j:suport>       compo= nent. +       = + + = + = + = = = @@ -305,5 +343,53 @@ } ...]]> = + + Vizit following pages at RichFaces Live Demo for m= ore information, examples and sources on the components used in the applica= tion and described in this chapter: + + = + + + + ModalPanel page for the <rich:modalPanel> component; + = + + = + + + Effect for the <= emphasis role=3D"bold"><rich:effect> = component; + = + + = + + + MediaOutput for the <a4j:mediaOutput> component; + = + + = + + + AjaxSupport fo= r the <a4j:suport> component; + = + + = + + + CommandLink for the <a4j:commandLink> component; + = + + = + + + AjaxForm for the <a4j:form> compo= nent; + = + + = + + + Poll for the <a4j:poll> component. + = + + + = Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/navig= ationPanel.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/src/main/docbook/includes/navigationP= anel.xml 2009-05-06 13:59:46 UTC (rev 14034) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/includes/navigationP= anel.xml 2009-05-06 14:31:47 UTC (rev 14035) @@ -1,7 +1,7 @@ -
      +
      - Navigation panel + Navigation tree The <rich:tre= e> component takes one of the main places = in the Photo Album and is tig= htly bounded with the application logic. = @@ -11,11 +11,11 @@ is used to group thematic albums and may contain a= s many albums as needed. = - There are two types of navigation panel in the app= lication: for a registered user and for a guest. + There are two types of navigation tree in the appl= ication: for a registered user and for a guest. The difference between them is that the first one = has a context menu and drag-and-drop possibility.
      - Navigation panel for a guest + Navigation tree for a guest = - Navigation panel for a guest is represented as a simple = + Navigation tree for a guest is represented as a simple = <rich:tree> component. @@ -41,7 +41,7 @@ According to the "Shelves - Albums" hierarchy= we need two nested <rich:treeNodesAda= ptor> components. The first one iterates over the Shelves collection = - that is returned from the getPredefinedShelves()<= /code> method: + that is returned from the getPredefinedShelves()<= /code> method of ShelfManager.java class: getPredefinedShelves() { @@ -58,7 +58,7 @@ "var" attribute. The "var" attrib= ute is used to get access to the data object of the current collection el= ement Shelf, = - so it is possible to output any necessary data: = + so it is possible to output any necessary data. Let's see the s= rc/main/webapp/includes/index/tree.xhtml file: = = - - - - - - - - - - - #{shelf.unvisitedImages.size()} new - - - - - - - - - - - - - - #{album.unvisitedImages.size()} new - - - - - - + + + + + + + + + + + + #{shelf.unvisitedImages.size()} n= ew + + + + = + + + + + + + + + + + #{album.unvisitedImages.size()} new + + + + + + ...]]> = - The image below shows how the navigation panel for= a guest is rendered on the page. = + The image below shows how the navigation tree for = a guest is rendered on the page. = =
      @@ -177,9 +173,9 @@
      =
      - Navigation panel for a registered user + Navigation tree for a registered user - As it was mentioned before a navigation panel for a reg= istered user has + As it was mentioned before a navigation tree for a regi= stered user has two main features: drag-and-drop and context menu. Cont= ext menu is described = in the "Context menu= " chapter. @@ -220,23 +216,32 @@ For this purpose we use previously mentioned = "dragValue", "dragType" - attributes: + attributes. Let's have a look at the src/mai= n/webapp/includes/index/tree.xhtml file: = - - ... - + + ... + + ... + ]]> To provide drop functionality for the marked albums, w= e should mark Shelves as drop zones in the application code too. = For this purpose we add the "= dropValue" and - "acceptedTypes" attributes to the "Shelf" node: + "acceptedTypes" attributes to the "Shelf" node in the same sr= c/main/webapp/includes/index/tree.xhtml file: - - ... - + + ... + ]]> The "acceptedTypes" attribute tells the "Shelf" node = @@ -246,14 +251,27 @@ so the "Shelf" node can accept it. - Finally we need to specify a listener in the "dropListener" - attribute in order to process drop on the server side: = + Finally in order to process drop on the server side we= need to specify a listener for the <r= ich:tree> in the "dropLis= tener" + attribute (src/main/webapp/includes/index/tree.x= html file): = - - ... -]]> = + + ... +]]> - The processDrop() method is shown in the = listing below: = + The code for the &l= t;rich:dragIndicator> looks like the following: + = + ]]> = + = + = + + The processDrop() method of DnDMana= ger.java class is shown in the listing below: = - Here is the whole example of the "Navigation panel for a register= ed user": + Here is the whole example of the "Navigation tree for a registere= d user": - +

      <= /a4j:commandLink>
      + + - - + = - + @@ -302,20 +322,20 @@ #{shelf.unvisitedImages.size()} new - + = - - + @@ -326,14 +346,15 @@ #{album.unvisitedImages.size()} new - + = = -]]>       = + + ]]> = The image below shows how the described above drag-and= -drop features are rendered in the Photo Album. = @@ -345,6 +366,38 @@ + + Vizit following pages at RichFaces Live Demo for m= ore information, examples and sources on the components used in the applica= tion and described in this chapter: + + = + + + + Tree for the <rich:tree> componen= t; + = + + = + + + Tree= NodesAdaptor for the <rich:tre= eNodesAdaptor> component; = + = + + = + + + DragIndicato= r for the <rich:dragIndicator&= gt; component; + = + + = + + + DragDropParameter= for the <rich:dndParam> component. + = + + = + = + = + =
      = Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/uploa= dImages.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/src/main/docbook/includes/uploadImage= s.xml 2009-05-06 13:59:46 UTC (rev 14034) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/includes/uploadImage= s.xml 2009-05-06 14:31:47 UTC (rev 14035) @@ -2,12 +2,12 @@
      Upload Images - In the previous chapter we have discussed how to create Navigation Pa= nels + In the previous chapter we have discussed how to create Navigation Tr= ees that represent "Shelves - Albums" hierarchy. = Now it is time to upload images. = - The implementation of <rich:file= Upload> = + The <rich:fileUpload> component = in the Photo Album application uses the embedded Flash module = that adds extra functionality to the component: @@ -23,8 +23,7 @@ - The "/includes/fileUpload/fileUploader.xhtml" page - is responsible for the photos uploading functionality: = + The code for the <rich:file= Upload> is contained in the "/includes/fileUp= load/fileUploader.xhtml" page: = The "fileUploadListener" attribute = - represents the action listener method listener() of the = fileUploadManager + represents the action listener method listener() of the = FileUploadManager class that is notified after file is uploaded. This method makes the main job on the upload: = @@ -85,7 +84,7 @@ ...]]> The listener() method is called at server side after every = file uploaded = - and saves files in a temporary folder or in RAM. = + and server saves these files in a temporary folder or in RAM depending o= n configuration. = In the Photo Album application the uploaded files are stored in the temp= orary folder because the value of the createTempFile parameter is set to= true. = See the code from the web.xml descriptor: @@ -93,22 +92,45 @@ = - Seam Filter - org.jboss.seam.servlet.SeamFilter - - createTempFiles - true - - ... + Seam Filter + org.jboss.seam.servlet.SeamFilter + + createTempFiles + true + + + maxRequestSize + 20000000 + ...]]> - After the image is stored in the temporary folder - the listener() method creates an Image object = + The listener() method creates an Image object = and extracts all image metadata such as Camera name, Image si= ze, etc. = - It saves six different sizes of the photo in order to create = thumbnails = - and perform images scaling. = + It performs scaling of an image and saves six different image= 's dimentions in order to create thumbnails. = After that the photo is added into the database = the temporary file is removed. + = + + Vizit following pages at RichFaces Live Demo for more informat= ion, examples and sources on the components used in the application and des= cribed in this chapter: + + = + + + + FileUpload page for = the <rich:fileUpload> component; + = + + = + + + AjaxSupport for the <a4j:suport> compon= ent. + = + + = + = + = + = + =
      --===============4225163476390598085==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 10:48:46 2009 Content-Type: multipart/mixed; boundary="===============1244355598667704854==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14036 - trunk/docs/realworld_app_guide/en/src/main/docbook. Date: Wed, 06 May 2009 10:45:49 -0400 Message-ID: --===============1244355598667704854== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: msorokin Date: 2009-05-06 10:45:48 -0400 (Wed, 06 May 2009) New Revision: 14036 Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml Log: added VUser Input Data Validation chapter Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-05-0= 6 14:31:47 UTC (rev 14035) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-05-0= 6 14:45:48 UTC (rev 14036) @@ -18,6 +18,7 @@ + ]> = @@ -77,6 +78,7 @@ &uploadImages; &contextMenu; &tooltips; + &validators; = &userPreferencesView; &errorsReports; --===============1244355598667704854==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 10:49:48 2009 Content-Type: multipart/mixed; boundary="===============2612913335011091694==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14037 - trunk/docs/realworld_app_guide/en/src/main/docbook/includes. Date: Wed, 06 May 2009 10:46:51 -0400 Message-ID: --===============2612913335011091694== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: msorokin Date: 2009-05-06 10:46:51 -0400 (Wed, 06 May 2009) New Revision: 14037 Added: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/validators.x= ml Log: added VUser Input Data Validation chapter https://jira.jboss.org/jira/browse/RF-5768 Added: trunk/docs/realworld_app_guide/en/src/main/docbook/includes/validato= rs.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/realworld_app_guide/en/src/main/docbook/includes/validators.= xml (rev 0) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/includes/validators.= xml 2009-05-06 14:46:51 UTC (rev 14037) @@ -0,0 +1,69 @@ + +
      + User Input Data Validation + + Validation of user input is a very frequent situation for a developer= . RichFaces library offers 3 component to get this job done: = + <rich:beanValidator/>, <rich:graphValidator/&= gt;, = + = + and <rich:ajaxValidator/>. The latter two components are used in the Photo Album = application. <rich:graphValidator/>= is intended to validate the whole object or the grap= h of interrelated objects and the validation occurs when the whole form is = submitted. While <rich:ajaxValidator= /> validates only one input field or a value at a = time, validation is activated upon some event and adds interactivity to t= he application. = + Both components use Hibernate validators which helps to locate valid= ation logic in one place, such approach is really helpful given that usuall= y data validation logic is stored in multiple places including UI pages and= in Java code that interacts with a database. + + + = + Let's have a look at the components usage on the registration page= . This is how the page looks like (some irrelevant details were removed fro= m the example): + = + + + ... + + + + + + + + + + + + + + + + + + + + + + + + + + + +...]]> = + = + + = + <rich:graphValidator/> validates the entity User object, in which restrictions= are set with the help of Hibernate annotations. = + When the Register button is= clicked on the name, password, sex etc. fields are v= alidated sequentially. In case of an error (for example, if a log= inName contains only on character and the annotation restricts i= t to at least 3 characters to be typed in) a error message in red color is= displayed next to the input field and the request is aborted. If all val= ues are valid the authenticator.register(user) method will be = invoked and the user will be saved to the database. = + = + + + <rich:ajaxValidator/> acts in a slightly different way, in our case it is attac= hed to the user.birthDate field. When the value of the field i= s changed and the field loses focus it is immediately validated. If the in= put data is incorrect and error message will displayed, which is a quick wa= y to respond to user input errors and avoid sending incorrect data to the s= erver. + = + + + If you would like to get more details about the validators that Ri= chFaces library provides please visit Live Demo web page an= d RichFaces Developer Guide. = + = + +
      --===============2612913335011091694==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 11:51:06 2009 Content-Type: multipart/mixed; boundary="===============2857371881618871734==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14038 - in branches/examples-data/photoapp/images: amarkhel/2 and 1 other directory. Date: Wed, 06 May 2009 11:48:08 -0400 Message-ID: --===============2857371881618871734== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-06 11:48:08 -0400 (Wed, 06 May 2009) New Revision: 14038 Added: branches/examples-data/photoapp/images/amarkhel/2/1/ Removed: branches/examples-data/photoapp/images/Viking/3/1/ Log: move album to amarkhel Copied: branches/examples-data/photoapp/images/amarkhel/2/1 (from rev 14037= , branches/examples-data/photoapp/images/Viking/3/1) --===============2857371881618871734==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 13:37:22 2009 Content-Type: multipart/mixed; boundary="===============6993905188278858154==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14039 - in trunk/examples/photoalbum/source: ejb/sql/short and 7 other directories. Date: Wed, 06 May 2009 13:34:23 -0400 Message-ID: --===============6993905188278858154== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-06 13:34:23 -0400 (Wed, 06 May 2009) New Revision: 14039 Removed: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457].= jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457]_= medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457]_= small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457]_= small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457]_= small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303x457]_= small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2158910844_= e5a6deeeab_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/1/ trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1799039821_= b6ee53167c_o_small80.jpg Modified: trunk/examples/photoalbum/source/ejb/sql/full/import.sql trunk/examples/photoalbum/source/ejb/sql/short/import.sql trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[303x457]= _medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[303x457]= _small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[303x457]= _small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[303x457]= _small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[303x457]= _small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[303x457]= _medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[303x457]= _small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[303x457]= _small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[303x457]= _small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[303x457]= _small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805365000_= ca64d20b10_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805365000_= ca64d20b10_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805365000_= ca64d20b10_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805365000_= ca64d20b10_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805365000_= ca64d20b10_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/103193233_8= 60c47c909_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/103193233_8= 60c47c909_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/103193233_8= 60c47c909_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/103193233_8= 60c47c909_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/103193233_8= 60c47c909_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350250361_= 2d963dd4e7_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350250361_= 2d963dd4e7_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350250361_= 2d963dd4e7_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350250361_= 2d963dd4e7_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350250361_= 2d963dd4e7_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042654579_= d25c0db64f_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042654579_= d25c0db64f_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042654579_= d25c0db64f_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042654579_= d25c0db64f_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042654579_= d25c0db64f_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[303x202]= _medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[303x202]= _small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[303x202]= _small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[303x202]= _small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[303x202]= _small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033975999_= 7e058fcf1c_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033975999_= 7e058fcf1c_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033975999_= 7e058fcf1c_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033975999_= 7e058fcf1c_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516027705_= ddff0a70dd_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516027705_= ddff0a70dd_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516027705_= ddff0a70dd_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516027705_= ddff0a70dd_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516027705_= ddff0a70dd_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/175097920= 5_6e51b47ce9_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/175097920= 5_6e51b47ce9_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/175097920= 5_6e51b47ce9_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/175097920= 5_6e51b47ce9_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/175097920= 5_6e51b47ce9_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/190666200= 4_655d0f6ccf_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/190666200= 4_655d0f6ccf_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/190666200= 4_655d0f6ccf_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/190666200= 4_655d0f6ccf_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/190666200= 4_655d0f6ccf_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/209045972= 7_f2888e5cbe_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/209045972= 7_f2888e5cbe_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/209045972= 7_f2888e5cbe_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/209045972= 7_f2888e5cbe_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/209045972= 7_f2888e5cbe_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229775292= 5_de29b5fb10_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229775292= 5_de29b5fb10_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229775292= 5_de29b5fb10_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229775292= 5_de29b5fb10_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229775292= 5_de29b5fb10_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/117215467= _5cccef9aaa_b_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/117215467= _5cccef9aaa_b_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/117215467= _5cccef9aaa_b_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/117215467= _5cccef9aaa_b_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/132376931= 4_fe850cd954_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/132376931= 4_fe850cd954_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/132376931= 4_fe850cd954_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/132376931= 4_fe850cd954_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/132376931= 4_fe850cd954_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/205579493= _baf0f850d1_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/205579493= _baf0f850d1_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/205579493= _baf0f850d1_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/205579493= _baf0f850d1_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/205579493= _baf0f850d1_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/219850283= 5_1644c8fde2_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/219850283= 5_1644c8fde2_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/219850283= 5_1644c8fde2_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/219850283= 5_1644c8fde2_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/219850283= 5_1644c8fde2_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01[303x20= 2]_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01[303x20= 2]_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01[303x20= 2]_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01[303x20= 2]_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01[303x20= 2]_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[305x457= ]_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[305x457= ]_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[305x457= ]_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[305x457= ]_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[305x457= ]_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/273927725= _c9f5ef5952_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/273927725= _c9f5ef5952_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/273927725= _c9f5ef5952_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/273927725= _c9f5ef5952_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[303x457= ]_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[303x457= ]_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[303x457= ]_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[303x457= ]_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[303x457= ]_small80.jpg Log: Change images Modified: trunk/examples/photoalbum/source/ejb/sql/full/import.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/sql/full/import.sql 2009-05-06 15:= 48:08 UTC (rev 14038) +++ trunk/examples/photoalbum/source/ejb/sql/full/import.sql 2009-05-06 17:= 34:23 UTC (rev 14039) @@ -2,534 +2,562 @@ INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (2, 'Nick', 'Curtis', 'nkur= tis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964'= , '1978-01-08', 1, 0, true); INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (3, 'John', 'Smith', 'jsmi= th(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964'= , '1970-01-08', 1, 0, true); = -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature images', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature images', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature images', 2, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature images', 3, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature pictures', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature pictures', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature pictures', 2, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature pictures', 3, '2009-12-18', true); --------------------------------------------------------------------- -- ALBUM - Animals" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals images', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals pictures', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (0, 'Animals'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (0,= '1750979205_6e51b47ce9_o.jpg', '1750979205_6e51b47ce9_o.jpg', 'Animals - 1= 750979205_6e51b47ce9_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 0); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (0, '= 1985-01-08', '++Beautiful',0, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (1, '= 1985-01-08', 'this is extremely Good:) Congratulations!',0, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (2, '= 1985-01-08', 'Very *lovely*',0, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (0, '= 1985-01-08', 'this is extremely Good:) Congratulations!',0, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (1,= '1906662004_655d0f6ccf_o.jpg', '1906662004_655d0f6ccf_o.jpg', 'Animals - 1= 906662004_655d0f6ccf_o.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T7= 7', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (3, '= 1985-01-08', 'fantastic shot !!!!!!',1, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (1, '= 1985-01-08', 'nice shot =3D) ',1, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (2, '= 1985-01-08', 'nice shot =3D) ',1, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (2,= '2090459727_f2888e5cbe_o.jpg', '2090459727_f2888e5cbe_o.jpg', 'Animals - 2= 090459727_f2888e5cbe_o.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110= IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (4, '= 1985-01-08', 'fantastic shot !!!!!!',2, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (5, '= 1985-01-08', 'Superb Shot and so beautiful Colors !!! ',2, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (3,= '2297752925_de29b5fb10_o.jpg', '2297752925_de29b5fb10_o.jpg', 'Animals - 2= 297752925_de29b5fb10_o.jpg image', '2009-12-18', 0, 'Nikon D60', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (3, '= 1985-01-08', 'that is a beautiful flower with great colours ',3, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (4, '= 1985-01-08', 'Fantastic job. Great light and color! Great shot!',3, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (5, '= 1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice= - details!!!',3, 3); INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (6, '= 1985-01-08', 'Gorgeous! Lovely color!',3, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (7, '= 1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',3, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (8, '= 1985-01-08', 'Amazing shot..',3, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (9, '= 1985-01-08', '++Beautiful',3, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (4,= '2298556444_2151b7a6c4_o.jpg', '2298556444_2151b7a6c4_o.jpg', 'Animals - 2= 298556444_2151b7a6c4_o.jpg image', '2009-12-18', 0, 'Sony Alpha DSLR-A350'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 4); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (10, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',4, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (11, = '1985-01-08', 'Beautiful colours. Nice close up. ',4, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (7, '= 1985-01-08', 'Stunning capture! :-)',4, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (8, '= 1985-01-08', 'Wonderful.',4, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (5,= '2508246015_313952406c_o.jpg', '2508246015_313952406c_o.jpg', 'Animals - 2= 508246015_313952406c_o.jpg image', '2009-12-18', 0, 'Canon Digital IXUS 80= IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 5); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (9, '= 1985-01-08', 'Gorgeous! Lovely color!',5, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (6,= '2521898117_f2ebf233c9_o.jpg', '2521898117_f2ebf233c9_o.jpg', 'Animals - 2= 521898117_f2ebf233c9_o.jpg image', '2009-12-18', 0, 'Pentax Optio E40', 10= 24, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 6); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (10, = '1985-01-08', 'this is extremely Good:) Congratulations!',6, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (11, = '1985-01-08', 'fantastic shot !!!!!!',6, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (7,= '308709862_f8f7fbcec4_b.jpg', '308709862_f8f7fbcec4_b.jpg', 'Animals - 308= 709862_f8f7fbcec4_b.jpg image', '2009-12-18', 0, 'Olympus Stylus mju 1040'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 7); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (12, = '1985-01-08', 'Amazing shot..',7, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (12, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',7, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (13, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',7, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8,= '3390059723_4b2883ee59_o.jpg', '3390059723_4b2883ee59_o.jpg', 'Animals - 3= 390059723_4b2883ee59_o.jpg image', '2009-12-18', 0, 'BBK DP810', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 8); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (14, = '1985-01-08', 'Wonderful.',8, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (15, = '1985-01-08', 'Amazing shot..',8, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (16, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',8, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (17, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',8, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (9,= '3390865548_e394404198_o.jpg', '3390865548_e394404198_o.jpg', 'Animals - 3= 390865548_e394404198_o.jpg image', '2009-12-18', 0, 'BenQ DC E800', 1024, = 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 9); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (18, = '1985-01-08', 'that is a beautiful flower with great colours ',9, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= , '3390879696_059660d45c_o.jpg', '3390879696_059660d45c_o.jpg', 'Animals - = 3390879696_059660d45c_o.jpg image', '2009-12-18', 0, 'Konica Minolta', 102= 4, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 10); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (13, = '1985-01-08', 'Stunning capture! :-)',10, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (14, = '1985-01-08', 'nice shot =3D) ',10, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (19, = '1985-01-08', 'Perfecft!',10, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (20, = '1985-01-08', 'whoah ! wonderful',10, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (21, = '1985-01-08', 'Wonderful.',10, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (22, = '1985-01-08', 'Amazing shot..',10, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= , '3390886140_b05ae25b14_o.jpg', '3390886140_b05ae25b14_o.jpg', 'Animals - = 3390886140_b05ae25b14_o.jpg image', '2009-12-18', 0, 'Panasonic', 1024, 19= 17, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 11); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (15, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',11, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (16, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',11, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (17, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',11, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (18, = '1985-01-08', 'Amazing shot..',11, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (23, = '1985-01-08', 'this is extremely Good:) Congratulations!',11, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (24, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',11, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (25, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',11, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (26, = '1985-01-08', 'Bellissima macro!',11, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12= , '3413588364_dd0d602b9b_o.jpg', '3413588364_dd0d602b9b_o.jpg', 'Animals - = 3413588364_dd0d602b9b_o.jpg image', '2009-12-18', 0, 'LG LDC-A310', 1024, = 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 12); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (19, = '1985-01-08', 'Stunning capture! :-)',12, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (20, = '1985-01-08', 'that is a beautiful flower with great colours ',12, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (21, = '1985-01-08', 'I Think this is Art!',12, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (27, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',12, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (28, = '1985-01-08', '++Beautiful',12, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (29, = '1985-01-08', 'Beautiful colours. Nice close up. ',12, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (30, = '1985-01-08', 'Beautiful colours. Nice close up. ',12, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (13= , '3415160108_c22eb69f37_o.jpg', '3415160108_c22eb69f37_o.jpg', 'Animals - = 3415160108_c22eb69f37_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 102= 4, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 13); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (31, = '1985-01-08', 'Wonderful.',13, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (14= , '3415165572_f6d48c2a21_o.jpg', '3415165572_f6d48c2a21_o.jpg', 'Animals - = 3415165572_f6d48c2a21_o.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T= 77', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 14); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (22, = '1985-01-08', 'Perfecft!',14, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (23, = '1985-01-08', 'Perfecft!',14, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (32, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',14, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (33, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',14, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (15= , '839245545_5db77619d5_o.jpg', '839245545_5db77619d5_o.jpg', 'Animals - 83= 9245545_5db77619d5_o.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 I= S', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 15); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (34, = '1985-01-08', 'Beautiful colours. Nice close up. ',15, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (35, = '1985-01-08', 'Gorgeous! Lovely color!',15, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (36, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',15, 2); UPDATE Album set coveringImage_id=3D15 where id =3D 0; = --------------------------------------------------------------------- -- ALBUM - Cars" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars images', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars pictures', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (1, 'Cars'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16= , '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 19019= 3308_ce2a4de5fa_o.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 76= 8, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 16); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (24, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',16, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (25, = '1985-01-08', 'Gorgeous! Lovely color!',16, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (37, = '1985-01-08', 'Amazing shot..',16, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (38, = '1985-01-08', 'Wonderful.',16, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (17= , '1941230817_bcce17b8ef_o.jpg', '1941230817_bcce17b8ef_o.jpg', 'Cars - 194= 1230817_bcce17b8ef_o.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', = 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 17); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (39, = '1985-01-08', 'whoah ! wonderful',17, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (18= , '2151423750_129317a034_o.jpg', '2151423750_129317a034_o.jpg', 'Cars - 215= 1423750_129317a034_o.jpg image', '2009-12-18', 1, 'Canon Digital IXUS 80 I= S (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 18); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (26, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',18, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (27, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',18, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (19= , '2233985073_9a3fd7d3ac_b.jpg', '2233985073_9a3fd7d3ac_b.jpg', 'Cars - 223= 3985073_9a3fd7d3ac_b.jpg image', '2009-12-18', 1, 'Pentax Optio E40', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 19); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (40, = '1985-01-08', 'Amazing shot..',19, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (41, = '1985-01-08', 'Perfecft!',19, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (42, = '1985-01-08', 'I Think this is Art!',19, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20= , '2386071696_2b4e84eddb_o.jpg', '2386071696_2b4e84eddb_o.jpg', 'Cars - 238= 6071696_2b4e84eddb_o.jpg image', '2009-12-18', 1, 'Olympus Stylus mju 1040= ', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 20); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (28, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',20, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (29, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',20, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (30, = '1985-01-08', 'whoah ! wonderful',20, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (43, = '1985-01-08', 'Stunning capture! :-)',20, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (44, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',20, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (45, = '1985-01-08', 'Gorgeous! Lovely color!',20, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (46, = '1985-01-08', 'Wonderful.',20, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (21= , '3089719367_a03a2b55a4_b.jpg', '3089719367_a03a2b55a4_b.jpg', 'Cars - 308= 9719367_a03a2b55a4_b.jpg image', '2009-12-18', 1, 'BBK DP810', 1024, 1917,= 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 21); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (31, = '1985-01-08', 'Gorgeous! Lovely color!',21, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (47, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',21, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (48, = '1985-01-08', 'Stunning capture! :-)',21, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (49, = '1985-01-08', '++Beautiful',21, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (22= , '3200944376_2867888262_b.jpg', '3200944376_2867888262_b.jpg', 'Cars - 320= 0944376_2867888262_b.jpg image', '2009-12-18', 1, 'BenQ DC E800', 1024, 19= 17, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 22); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (32, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',22, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (33, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',22, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (50, = '1985-01-08', 'this is extremely Good:) Congratulations!',22, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (51, = '1985-01-08', 'Gorgeous! Lovely color!',22, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (52, = '1985-01-08', 'fantastic shot !!!!!!',22, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (53, = '1985-01-08', 'Bellissima macro!',22, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (23= , '3286825259_2a927e8ec1_o.jpg', '3286825259_2a927e8ec1_o.jpg', 'Cars - 328= 6825259_2a927e8ec1_o.jpg image', '2009-12-18', 1, 'Konica Minolta', 1024, = 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 23); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (34, = '1985-01-08', 'fantastic shot !!!!!!',23, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (35, = '1985-01-08', 'Beautiful colours. Nice close up. ',23, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (54, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',23, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (55, = '1985-01-08', 'Wonderful.',23, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24= , '3287637120_c1b3495371_o.jpg', '3287637120_c1b3495371_o.jpg', 'Cars - 328= 7637120_c1b3495371_o.jpg image', '2009-12-18', 1, 'Panasonic', 1024, 1917,= 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 24); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (36, = '1985-01-08', 'Bellissima macro!',24, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (37, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',24, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (56, = '1985-01-08', 'Wonderful.',24, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (25= , '3327664478_7f77093f52_o.jpg', '3327664478_7f77093f52_o.jpg', 'Cars - 332= 7664478_7f77093f52_o.jpg image', '2009-12-18', 1, 'LG LDC-A310', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 25); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (38, = '1985-01-08', 'Wonderful.',25, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (57, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',25, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (58, = '1985-01-08', 'nice shot =3D) ',25, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (59, = '1985-01-08', 'Bellissima macro!',25, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26= , '361088850_73d4bef19a_o.jpg', '361088850_73d4bef19a_o.jpg', 'Cars - 36108= 8850_73d4bef19a_o.jpg image', '2009-12-18', 1, 'Canon EOS 450D', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 26); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (39, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',26, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (40, = '1985-01-08', 'fantastic shot !!!!!!',26, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (41, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',26, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (60, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',26, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (61, = '1985-01-08', 'Gorgeous! Lovely color!',26, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (62, = '1985-01-08', 'Very *lovely*',26, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (63, = '1985-01-08', 'Gorgeous! Lovely color!',26, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27= , '361091514_20cd7e7eea_o.jpg', '361091514_20cd7e7eea_o.jpg', 'Cars - 36109= 1514_20cd7e7eea_o.jpg image', '2009-12-18', 1, 'Sony CyberShot DSC-T77', 1= 024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 27); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (64, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',27, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (65, = '1985-01-08', 'Wonderful.',27, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (66, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',27, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (67, = '1985-01-08', 'whoah ! wonderful',27, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (28= , '361092609_25d6d4bd90_o.jpg', '361092609_25d6d4bd90_o.jpg', 'Cars - 36109= 2609_25d6d4bd90_o.jpg image', '2009-12-18', 1, 'Canon PowerShot SX110 IS',= 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 28); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (42, = '1985-01-08', 'Bellissima macro!',28, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (43, = '1985-01-08', 'nice shot =3D) ',28, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (44, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',28, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (68, = '1985-01-08', 'Beautiful colours. Nice close up. ',28, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (69, = '1985-01-08', 'Very *lovely*',28, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (70, = '1985-01-08', 'I Think this is Art!',28, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (29= , '400440032_a63fe65cab_o.jpg', '400440032_a63fe65cab_o.jpg', 'Cars - 40044= 0032_a63fe65cab_o.jpg image', '2009-12-18', 1, 'Nikon D60', 1024, 1917, 76= 8, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 29); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (45, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',29, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (46, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',29, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (47, = '1985-01-08', 'this is extremely Good:) Congratulations!',29, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (48, = '1985-01-08', 'I Think this is Art!',29, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (71, = '1985-01-08', 'Gorgeous! Lovely color!',29, 2); UPDATE Album set coveringImage_id=3D29 where id =3D 1; = --------------------------------------------------------------------- -- ALBUM - Monuments and just buildings" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings images', 4, '20= 09-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings pictures', 4, '= 2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (2, 'Monuments and just buildings'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (30= , '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[= 303x457].jpg image', '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, = 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 30); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (49, = '1985-01-08', 'I Think this is Art!',30, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (72, = '1985-01-08', 'Gorgeous! Lovely color!',30, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (73, = '1985-01-08', 'this is extremely Good:) Congratulations!',30, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (74, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',30, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (31= , '07[303x457].jpg', '07[303x457].jpg', 'Monuments and just buildings - 07[= 303x457].jpg image', '2009-12-18', 2, 'Canon Digital IXUS 80 IS (PowerShot= SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 31); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (50, = '1985-01-08', 'I Think this is Art!',31, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (51, = '1985-01-08', 'nice shot =3D) ',31, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (52, = '1985-01-08', 'whoah ! wonderful',31, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (32= , '1805365000_ca64d20b10_o.jpg', '1805365000_ca64d20b10_o.jpg', 'Monuments = and just buildings - 1805365000_ca64d20b10_o.jpg image', '2009-12-18', 2, = 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 32); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (33= , '1[303x457].jpg', '1[303x457].jpg', 'Monuments and just buildings - 1[303= x457].jpg image', '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, = 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 33); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (75, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',33, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (76, = '1985-01-08', 'Bellissima macro!',33, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (34= , '2099090261_1efb89ae95_o.jpg', '2099090261_1efb89ae95_o.jpg', 'Monuments = and just buildings - 2099090261_1efb89ae95_o.jpg image', '2009-12-18', 2, = 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 34); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (53, = '1985-01-08', 'that is a beautiful flower with great colours ',34, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (54, = '1985-01-08', 'Such a lovely colour azaga!',34, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (55, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',34, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (77, = '1985-01-08', 'whoah ! wonderful',34, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (78, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',34, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (35= , '2976358258_5c08813ddf_o.jpg', '2976358258_5c08813ddf_o.jpg', 'Monuments = and just buildings - 2976358258_5c08813ddf_o.jpg image', '2009-12-18', 2, = 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 35); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (56, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',35, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (57, = '1985-01-08', 'Wonderful.',35, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (58, = '1985-01-08', 'Bellissima macro!',35, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (79, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',35, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (36= , '2[457x303].jpg', '2[457x303].jpg', 'Monuments and just buildings - 2[457= x303].jpg image', '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '200= 9-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 36); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (59, = '1985-01-08', 'Perfecft!',36, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (60, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',36, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (61, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',36, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (80, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',36, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (81, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',36, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (82, = '1985-01-08', 'Such a lovely colour azaga!',36, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (83, = '1985-01-08', 'Such a lovely colour azaga!',36, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (37= , '32971256_8bd6bf165d_o.jpg', '32971256_8bd6bf165d_o.jpg', 'Monuments and = just buildings - 32971256_8bd6bf165d_o.jpg image', '2009-12-18', 2, 'Panas= onic', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 37); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (62, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',37, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (63, = '1985-01-08', 'Very *lovely*',37, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (64, = '1985-01-08', 'Such a lovely colour azaga!',37, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (84, = '1985-01-08', 'Wonderful.',37, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (85, = '1985-01-08', 'Amazing shot..',37, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (86, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',37, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (87, = '1985-01-08', 'that is a beautiful flower with great colours ',37, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (38= , '3392872753_e47f1c7078_o.jpg', '3392872753_e47f1c7078_o.jpg', 'Monuments = and just buildings - 3392872753_e47f1c7078_o.jpg image', '2009-12-18', 2, = 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 38); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (88, = '1985-01-08', 'nice shot =3D) ',38, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (89, = '1985-01-08', 'Stunning capture! :-)',38, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (39= , '3397511520_9839039136_o.jpg', '3397511520_9839039136_o.jpg', 'Monuments = and just buildings - 3397511520_9839039136_o.jpg image', '2009-12-18', 2, = 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 39); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (90, = '1985-01-08', 'Gorgeous! Lovely color!',39, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (40= , '3399540332_576df61129_o.jpg', '3399540332_576df61129_o.jpg', 'Monuments = and just buildings - 3399540332_576df61129_o.jpg image', '2009-12-18', 2, = 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 40); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (65, = '1985-01-08', 'Gorgeous! Lovely color!',40, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (66, = '1985-01-08', 'this is extremely Good:) Congratulations!',40, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (67, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',40, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (91, = '1985-01-08', 'Wonderful.',40, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (92, = '1985-01-08', 'Very *lovely*',40, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (41= , '3403152285_3e72d1264a_o.jpg', '3403152285_3e72d1264a_o.jpg', 'Monuments = and just buildings - 3403152285_3e72d1264a_o.jpg image', '2009-12-18', 2, = 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 41); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (68, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',41, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (69, = '1985-01-08', 'I Think this is Art!',41, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (70, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',41, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (71, = '1985-01-08', 'Gorgeous! Lovely color!',41, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (93, = '1985-01-08', '++Beautiful',41, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (42= , '3413630679_d77f525413_o.jpg', '3413630679_d77f525413_o.jpg', 'Monuments = and just buildings - 3413630679_d77f525413_o.jpg image', '2009-12-18', 2, = 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 42); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (72, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',42, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (73, = '1985-01-08', 'whoah ! wonderful',42, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (74, = '1985-01-08', 'Stunning capture! :-)',42, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (75, = '1985-01-08', 'Wonderful.',42, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (94, = '1985-01-08', 'Amazing shot..',42, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (43= , '3414974777_a4f44f69c7_o.jpg', '3414974777_a4f44f69c7_o.jpg', 'Monuments = and just buildings - 3414974777_a4f44f69c7_o.jpg image', '2009-12-18', 2, = 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 43); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (76, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',43, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (77, = '1985-01-08', 'Perfecft!',43, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (78, = '1985-01-08', 'Wonderful.',43, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (79, = '1985-01-08', 'Such a lovely colour azaga!',43, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (95, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',43, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (44= , '3415278215_968db2dbbf_o.jpg', '3415278215_968db2dbbf_o.jpg', 'Monuments = and just buildings - 3415278215_968db2dbbf_o.jpg image', '2009-12-18', 2, = 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12= -01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 44); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (80, = '1985-01-08', 'Stunning capture! :-)',44, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (81, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',44, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (96, = '1985-01-08', 'this is extremely Good:) Congratulations!',44, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (97, = '1985-01-08', 'that is a beautiful flower with great colours ',44, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (98, = '1985-01-08', 'fantastic shot !!!!!!',44, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (45= , '3415840434_949aeabf08_o.jpg', '3415840434_949aeabf08_o.jpg', 'Monuments = and just buildings - 3415840434_949aeabf08_o.jpg image', '2009-12-18', 2, = 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 45); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (82, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',45, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (83, = '1985-01-08', 'this is extremely Good:) Congratulations!',45, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (84, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',45, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (85, = '1985-01-08', 'Amazing shot..',45, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (99, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',45, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (46= , '370031898_84e952e0b0_o.jpg', '370031898_84e952e0b0_o.jpg', 'Monuments an= d just buildings - 370031898_84e952e0b0_o.jpg image', '2009-12-18', 2, 'Ol= ympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 46); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (86, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',46, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (87, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',46, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (88, = '1985-01-08', 'fantastic shot !!!!!!',46, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (89, = '1985-01-08', 'Bellissima macro!',46, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (100,= '1985-01-08', 'fantastic shot !!!!!!',46, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (101,= '1985-01-08', 'this is extremely Good:) Congratulations!',46, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (47= , '381889523_f276d45e9d_o.jpg', '381889523_f276d45e9d_o.jpg', 'Monuments an= d just buildings - 381889523_f276d45e9d_o.jpg image', '2009-12-18', 2, 'BB= K DP810', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 47); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (90, = '1985-01-08', 'fantastic shot !!!!!!',47, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (102,= '1985-01-08', 'I Think this is Art!',47, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (48= , '441026665_07699ebddd_o.jpg', '441026665_07699ebddd_o.jpg', 'Monuments an= d just buildings - 441026665_07699ebddd_o.jpg image', '2009-12-18', 2, 'Be= nQ DC E800', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 48); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (91, = '1985-01-08', 'that is a beautiful flower with great colours ',48, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (92, = '1985-01-08', 'Bellissima macro!',48, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (93, = '1985-01-08', 'I Think this is Art!',48, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (103,= '1985-01-08', 'Gorgeous! Lovely color!',48, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (49= , '4[457x303].jpg', '4[457x303].jpg', 'Monuments and just buildings - 4[457= x303].jpg image', '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '200= 9-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 49); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (104,= '1985-01-08', 'Gorgeous! Lovely color!',49, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (50= , '960942349_dcc90c0a61_o.jpg', '960942349_dcc90c0a61_o.jpg', 'Monuments an= d just buildings - 960942349_dcc90c0a61_o.jpg image', '2009-12-18', 2, 'Pa= nasonic', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 50); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (105,= '1985-01-08', 'Beautiful colours. Nice close up. ',50, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (106,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',50, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (107,= '1985-01-08', 'Very *lovely*',50, 3); UPDATE Album set coveringImage_id=3D50 where id =3D 2; = --------------------------------------------------------------------- -- ALBUM - Nature" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature images', 2, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature pictures', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (3, 'Nature'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (51= , '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image', = '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 51); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (94, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',51, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (108,= '1985-01-08', 'Perfecft!',51, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (109,= '1985-01-08', 'I Think this is Art!',51, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (110,= '1985-01-08', 'that is a beautiful flower with great colours ',51, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (52= , '1[305x457].jpg', '1[305x457].jpg', 'Nature - 1[305x457].jpg image', '20= 09-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 52); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (111,= '1985-01-08', 'really pretty. it looks like there is a lady in the _center= _, blowing kisses!!',52, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (53= , '273927725_c9f5ef5952_o.jpg', '273927725_c9f5ef5952_o.jpg', 'Nature - 273= 927725_c9f5ef5952_o.jpg image', '2009-12-18', 3, 'Sony CyberShot DSC-T77',= 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 53); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (95, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',53, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (96, = '1985-01-08', 'that is a beautiful flower with great colours ',53, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (97, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',53, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (112,= '1985-01-08', 'Very *lovely*',53, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (113,= '1985-01-08', 'Very *lovely*',53, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (114,= '1985-01-08', 'whoah ! wonderful',53, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (115,= '1985-01-08', 'Bellissima macro!',53, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (54= , '2[303x457].jpg', '2[303x457].jpg', 'Nature - 2[303x457].jpg image', '20= 09-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', tr= ue, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 54); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (98, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',54, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (99, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',54, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (100,= '1985-01-08', 'Gorgeous! Lovely color!',54, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (116,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',54, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (117,= '1985-01-08', 'I Think this is Art!',54, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (55= , '3392730627_1cdb18cba6_o.jpg', '3392730627_1cdb18cba6_o.jpg', 'Nature - 3= 392730627_1cdb18cba6_o.jpg image', '2009-12-18', 3, 'Nikon D60', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 55); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (56= , '3392993334_36d7f097df_o.jpg', '3392993334_36d7f097df_o.jpg', 'Nature - 3= 392993334_36d7f097df_o.jpg image', '2009-12-18', 3, 'Sony Alpha DSLR-A350'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 56); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (101,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',56, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (102,= '1985-01-08', '++Beautiful',56, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (103,= '1985-01-08', 'I Think this is Art!',56, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (118,= '1985-01-08', 'Stunning capture! :-)',56, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (119,= '1985-01-08', 'Wonderful.',56, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (120,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',56, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (57= , '3393235094_7cc613d363_o.jpg', '3393235094_7cc613d363_o.jpg', 'Nature - 3= 393235094_7cc613d363_o.jpg image', '2009-12-18', 3, 'Canon Digital IXUS 80= IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 57); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (121,= '1985-01-08', 'Amazing shot..',57, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (122,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',57, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (58= , '3412793157_683290a536_o.jpg', '3412793157_683290a536_o.jpg', 'Nature - 3= 412793157_683290a536_o.jpg image', '2009-12-18', 3, 'Pentax Optio E40', 10= 24, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 58); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (59= , '3414996504_b42abb3be6_o.jpg', '3414996504_b42abb3be6_o.jpg', 'Nature - 3= 414996504_b42abb3be6_o.jpg image', '2009-12-18', 3, 'Olympus Stylus mju 10= 40', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 59); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (104,= '1985-01-08', 'Beautiful colours. Nice close up. ',59, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (105,= '1985-01-08', 'Wonderful.',59, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (60= , '3415639261_20d2d3b52c_o.jpg', '3415639261_20d2d3b52c_o.jpg', 'Nature - 3= 415639261_20d2d3b52c_o.jpg image', '2009-12-18', 3, 'BBK DP810', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 60); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (106,= '1985-01-08', 'Such a lovely colour azaga!',60, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (107,= '1985-01-08', 'fantastic shot !!!!!!',60, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (108,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',60, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (61= , '3416307534_40f6616283_o.jpg', '3416307534_40f6616283_o.jpg', 'Nature - 3= 416307534_40f6616283_o.jpg image', '2009-12-18', 3, 'BenQ DC E800', 1024, = 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 61); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (109,= '1985-01-08', 'Beautiful colours. Nice close up. ',61, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (110,= '1985-01-08', 'Beautiful colours. Nice close up. ',61, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (111,= '1985-01-08', 'Amazing shot..',61, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (112,= '1985-01-08', 'Beautiful colours. Nice close up. ',61, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (123,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',61, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (124,= '1985-01-08', 'Wonderful.',61, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (62= , '3416321407_068332d9f2_o.jpg', '3416321407_068332d9f2_o.jpg', 'Nature - 3= 416321407_068332d9f2_o.jpg image', '2009-12-18', 3, 'Konica Minolta', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 62); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (113,= '1985-01-08', 'fantastic shot !!!!!!',62, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (114,= '1985-01-08', 'I Think this is Art!',62, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (125,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',62, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (126,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',62, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (63= , '3416371116_f793561d19_o.jpg', '3416371116_f793561d19_o.jpg', 'Nature - 3= 416371116_f793561d19_o.jpg image', '2009-12-18', 3, 'Panasonic', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 63); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (115,= '1985-01-08', 'fantastic shot !!!!!!',63, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (127,= '1985-01-08', 'Stunning capture! :-)',63, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (128,= '1985-01-08', 'this is extremely Good:) Congratulations!',63, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (64= , '3417131300_2aac5ec32c_o.jpg', '3417131300_2aac5ec32c_o.jpg', 'Nature - 3= 417131300_2aac5ec32c_o.jpg image', '2009-12-18', 3, 'LG LDC-A310', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 64); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (116,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',64, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (117,= '1985-01-08', 'Beautiful colours. Nice close up. ',64, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (129,= '1985-01-08', 'Beautiful colours. Nice close up. ',64, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (130,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',64, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (131,= '1985-01-08', 'I Think this is Art!',64, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (132,= '1985-01-08', 'I Think this is Art!',64, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (65= , '3417132360_56d0b48a9d_o.jpg', '3417132360_56d0b48a9d_o.jpg', 'Nature - 3= 417132360_56d0b48a9d_o.jpg image', '2009-12-18', 3, 'Canon EOS 450D', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 65); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (118,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',65, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (119,= '1985-01-08', 'Such a lovely colour azaga!',65, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (133,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',65, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (134,= '1985-01-08', 'Very *lovely*',65, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (135,= '1985-01-08', 'Beautiful colours. Nice close up. ',65, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (136,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',65, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (66= , '3417319507_8d1f2d5c77_o.jpg', '3417319507_8d1f2d5c77_o.jpg', 'Nature - 3= 417319507_8d1f2d5c77_o.jpg image', '2009-12-18', 3, 'Sony CyberShot DSC-T7= 7', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 66); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (120,= '1985-01-08', 'that is a beautiful flower with great colours ',66, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (121,= '1985-01-08', 'Amazing shot..',66, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (137,= '1985-01-08', 'I Think this is Art!',66, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (138,= '1985-01-08', 'Bellissima macro!',66, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (139,= '1985-01-08', '++Beautiful',66, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (67= , '3417494725_e21724aba9_o.jpg', '3417494725_e21724aba9_o.jpg', 'Nature - 3= 417494725_e21724aba9_o.jpg image', '2009-12-18', 3, 'Canon PowerShot SX110= IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 67); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (122,= '1985-01-08', 'that is a beautiful flower with great colours ',67, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (68= , '3418371942_a61ae58de4_o.jpg', '3418371942_a61ae58de4_o.jpg', 'Nature - 3= 418371942_a61ae58de4_o.jpg image', '2009-12-18', 3, 'Nikon D60', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 68); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (123,= '1985-01-08', 'Amazing shot..',68, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (124,= '1985-01-08', 'fantastic shot !!!!!!',68, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (125,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',68, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (126,= '1985-01-08', 'Wonderful.',68, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (140,= '1985-01-08', 'Perfecft!',68, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (69= , '345009210_1f826cd5a1_o.jpg', '345009210_1f826cd5a1_o.jpg', 'Nature - 345= 009210_1f826cd5a1_o.jpg image', '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1= 024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 69); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (70= , '55109059_55408b3d5f_o.jpg', '55109059_55408b3d5f_o.jpg', 'Nature - 55109= 059_55408b3d5f_o.jpg image', '2009-12-18', 3, 'Canon Digital IXUS 80 IS (P= owerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 70); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (127,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',70, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (128,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',70, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (129,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',70, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (130,= '1985-01-08', 'Stunning capture! :-)',70, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (141,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',70, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (142,= '1985-01-08', 'Stunning capture! :-)',70, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (71= , '570841724_b11c8b0df2_o.jpg', '570841724_b11c8b0df2_o.jpg', 'Nature - 570= 841724_b11c8b0df2_o.jpg image', '2009-12-18', 3, 'Pentax Optio E40', 1024,= 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 71); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (131,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',71, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (143,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',71, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (72= , '672840660_4a91f39f02_o.jpg', '672840660_4a91f39f02_o.jpg', 'Nature - 672= 840660_4a91f39f02_o.jpg image', '2009-12-18', 3, 'Olympus Stylus mju 1040'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 72); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (132,= '1985-01-08', 'that is a beautiful flower with great colours ',72, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (144,= '1985-01-08', 'this is extremely Good:) Congratulations!',72, 3); UPDATE Album set coveringImage_id=3D72 where id =3D 3; = --------------------------------------------------------------------- -- ALBUM - Portrait" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait images', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait pictures', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (4, 'Portrait'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (73= , '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',= '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 73); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (133,= '1985-01-08', 'Beautiful colours. Nice close up. ',73, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (134,= '1985-01-08', 'Such a lovely colour azaga!',73, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (145,= '1985-01-08', 'Amazing shot..',73, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (146,= '1985-01-08', 'whoah ! wonderful',73, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (147,= '1985-01-08', 'fantastic shot !!!!!!',73, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (148,= '1985-01-08', 'Bellissima macro!',73, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (74= , '1033975999_7e058fcf1c_o.jpg', '1033975999_7e058fcf1c_o.jpg', 'Portrait -= 1033975999_7e058fcf1c_o.jpg image', '2009-12-18', 4, 'BenQ DC E800', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 74); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (135,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',74, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (149,= '1985-01-08', 'that is a beautiful flower with great colours ',74, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (150,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',74, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (151,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',74, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (75= , '1516027705_ddff0a70dd_o.jpg', '1516027705_ddff0a70dd_o.jpg', 'Portrait -= 1516027705_ddff0a70dd_o.jpg image', '2009-12-18', 4, 'Konica Minolta', 10= 24, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 75); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (136,= '1985-01-08', 'nice shot =3D) ',75, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (137,= '1985-01-08', 'Beautiful colours. Nice close up. ',75, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (138,= '1985-01-08', 'Bellissima macro!',75, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (139,= '1985-01-08', 'Beautiful colours. Nice close up. ',75, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (152,= '1985-01-08', 'Beautiful colours. Nice close up. ',75, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (153,= '1985-01-08', 'that is a beautiful flower with great colours ',75, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (76= , '1799039821_b6ee53167c_o.jpg', '1799039821_b6ee53167c_o.jpg', 'Portrait -= 1799039821_b6ee53167c_o.jpg image', '2009-12-18', 4, 'Panasonic', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 76); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (140,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',76, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (141,= '1985-01-08', 'Bellissima macro!',76, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (142,= '1985-01-08', 'I Think this is Art!',76, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (154,= '1985-01-08', 'this is extremely Good:) Congratulations!',76, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (155,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',76, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (77= , '19654343_f445e1efa2_o.jpg', '19654343_f445e1efa2_o.jpg', 'Portrait - 196= 54343_f445e1efa2_o.jpg image', '2009-12-18', 4, 'LG LDC-A310', 1024, 1917,= 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 77); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (143,= '1985-01-08', 'Such a lovely colour azaga!',77, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (144,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',77, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (145,= '1985-01-08', 'Beautiful colours. Nice close up. ',77, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (156,= '1985-01-08', 'Wonderful.',77, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (157,= '1985-01-08', 'Very *lovely*',77, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (78= , '2187016030_e81b911b3e_o.jpg', '2187016030_e81b911b3e_o.jpg', 'Portrait -= 2187016030_e81b911b3e_o.jpg image', '2009-12-18', 4, 'Canon EOS 450D', 10= 24, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 78); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (158,= '1985-01-08', 'Perfecft!',78, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (159,= '1985-01-08', 'I Think this is Art!',78, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (79= , '2307649188_a6206c17a4_o.jpg', '2307649188_a6206c17a4_o.jpg', 'Portrait -= 2307649188_a6206c17a4_o.jpg image', '2009-12-18', 4, 'Sony CyberShot DSC-= T77', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 79); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (146,= '1985-01-08', 'whoah ! wonderful',79, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (147,= '1985-01-08', 'nice shot =3D) ',79, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (148,= '1985-01-08', 'this is extremely Good:) Congratulations!',79, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (149,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',79, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (80= , '2879155528_1ebbaaf951_o.jpg', '2879155528_1ebbaaf951_o.jpg', 'Portrait -= 2879155528_1ebbaaf951_o.jpg image', '2009-12-18', 4, 'Canon PowerShot SX1= 10 IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 80); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (150,= '1985-01-08', 'Such a lovely colour azaga!',80, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (151,= '1985-01-08', 'Such a lovely colour azaga!',80, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (152,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',80, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (153,= '1985-01-08', 'that is a beautiful flower with great colours ',80, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (81= , '2933904745_b323535d4a_o.jpg', '2933904745_b323535d4a_o.jpg', 'Portrait -= 2933904745_b323535d4a_o.jpg image', '2009-12-18', 4, 'Nikon D60', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 81); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (154,= '1985-01-08', 'this is extremely Good:) Congratulations!',81, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (155,= '1985-01-08', 'nice shot =3D) ',81, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (156,= '1985-01-08', 'Beautiful colours. Nice close up. ',81, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (157,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',81, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (160,= '1985-01-08', 'Such a lovely colour azaga!',81, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (161,= '1985-01-08', 'whoah ! wonderful',81, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (162,= '1985-01-08', 'Perfecft!',81, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (163,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',81, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (82= , '3-3.jpg', '3-3.jpg', 'Portrait - 3-3.jpg image', '2009-12-18', 4, 'Sony= Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 82); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (158,= '1985-01-08', 'that is a beautiful flower with great colours ',82, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (159,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',82, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (160,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',82, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (164,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',82, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (165,= '1985-01-08', 'Stunning capture! :-)',82, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (166,= '1985-01-08', 'whoah ! wonderful',82, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (83= , '3176975826_ef29a459fa_o.jpg', '3176975826_ef29a459fa_o.jpg', 'Portrait -= 3176975826_ef29a459fa_o.jpg image', '2009-12-18', 4, 'Canon Digital IXUS = 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 83); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (161,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',83, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (162,= '1985-01-08', 'fantastic shot !!!!!!',83, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (163,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',83, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (164,= '1985-01-08', 'fantastic shot !!!!!!',83, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (167,= '1985-01-08', 'Amazing shot..',83, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (84= , '323301225_3aef765e5a_o.jpg', '323301225_3aef765e5a_o.jpg', 'Portrait - 3= 23301225_3aef765e5a_o.jpg image', '2009-12-18', 4, 'Pentax Optio E40', 102= 4, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 84); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (165,= '1985-01-08', 'Wonderful.',84, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (166,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',84, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (167,= '1985-01-08', 'fantastic shot !!!!!!',84, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (168,= '1985-01-08', 'Gorgeous! Lovely color!',84, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (169,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',84, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (170,= '1985-01-08', 'Such a lovely colour azaga!',84, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (85= , 'img_0103.jpg', 'img_0103.jpg', 'Portrait - img_0103.jpg image', '2009-1= 2-18', 4, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, t= rue); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 85); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (86= , '_mg_0161.jpg', '_mg_0161.jpg', 'Portrait - _mg_0161.jpg image', '2009-1= 2-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 86); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (168,= '1985-01-08', 'I Think this is Art!',86, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (171,= '1985-01-08', 'Very *lovely*',86, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (172,= '1985-01-08', 'Very *lovely*',86, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (173,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',86, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (174,= '1985-01-08', 'Perfecft!',86, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (87= , '_mg_0264.jpg', '_mg_0264.jpg', 'Portrait - _mg_0264.jpg image', '2009-1= 2-18', 4, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 87); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (169,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',87, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (170,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',87, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (88= , '_mg_0510.jpg', '_mg_0510.jpg', 'Portrait - _mg_0510.jpg image', '2009-1= 2-18', 4, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 88); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (171,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',88, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (172,= '1985-01-08', 'nice shot =3D) ',88, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (175,= '1985-01-08', 'this is extremely Good:) Congratulations!',88, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (176,= '1985-01-08', 'Bellissima macro!',88, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (177,= '1985-01-08', 'that is a beautiful flower with great colours ',88, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (178,= '1985-01-08', 'Stunning capture! :-)',88, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (89= , '_mg_1788.jpg', '_mg_1788.jpg', 'Portrait - _mg_1788.jpg image', '2009-1= 2-18', 4, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 89); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (173,= '1985-01-08', 'Stunning capture! :-)',89, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (179,= '1985-01-08', 'that is a beautiful flower with great colours ',89, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (180,= '1985-01-08', 'that is a beautiful flower with great colours ',89, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (181,= '1985-01-08', 'really pretty. it looks like there is a lady in the _center= _, blowing kisses!!',89, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (182,= '1985-01-08', 'Wonderful.',89, 1); UPDATE Album set coveringImage_id=3D89 where id =3D 4; = --------------------------------------------------------------------- -- ALBUM - Sport" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport images', 4, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport pictures', 4, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (5, 'Sport'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (90= , '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 1031= 93233_860c47c909_o.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 1917,= 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 90); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (174,= '1985-01-08', 'Beautiful colours. Nice close up. ',90, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (175,= '1985-01-08', 'Wonderful.',90, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (176,= '1985-01-08', 'fantastic shot !!!!!!',90, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (177,= '1985-01-08', 'fantastic shot !!!!!!',90, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (183,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',90, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (184,= '1985-01-08', 'fantastic shot !!!!!!',90, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (185,= '1985-01-08', 'that is a beautiful flower with great colours ',90, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (186,= '1985-01-08', 'Beautiful colours. Nice close up. ',90, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (91= , '1350250361_2d963dd4e7_o.jpg', '1350250361_2d963dd4e7_o.jpg', 'Sport - 13= 50250361_2d963dd4e7_o.jpg image', '2009-12-18', 5, 'Canon EOS 450D', 1024,= 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 91); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (178,= '1985-01-08', 'Such a lovely colour azaga!',91, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (92= , '2042654579_d25c0db64f_o.jpg', '2042654579_d25c0db64f_o.jpg', 'Sport - 20= 42654579_d25c0db64f_o.jpg image', '2009-12-18', 5, 'Sony CyberShot DSC-T77= ', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 92); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (179,= '1985-01-08', 'Gorgeous! Lovely color!',92, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (187,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',92, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (188,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',92, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (189,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',92, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (190,= '1985-01-08', 'whoah ! wonderful',92, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (93= , '2158910844_e5a6deeeab_o.jpg', '2158910844_e5a6deeeab_o.jpg', 'Sport - 21= 58910844_e5a6deeeab_o.jpg image', '2009-12-18', 5, 'Canon PowerShot SX110 = IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 93); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (180,= '1985-01-08', 'Wonderful.',93, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (181,= '1985-01-08', 'Wonderful.',93, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (182,= '1985-01-08', 'I Think this is Art!',93, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (191,= '1985-01-08', 'that is a beautiful flower with great colours ',93, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (192,= '1985-01-08', 'I Think this is Art!',93, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (193,= '1985-01-08', 'nice shot =3D) ',93, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (194,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',93, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (94= , '2228156682_74520fa2e5_o.jpg', '2228156682_74520fa2e5_o.jpg', 'Sport - 22= 28156682_74520fa2e5_o.jpg image', '2009-12-18', 5, 'Nikon D60', 1024, 1917= , 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 94); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (183,= '1985-01-08', 'whoah ! wonderful',94, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (184,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',94, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (185,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',94, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (195,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',94, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (196,= '1985-01-08', 'Wonderful.',94, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (197,= '1985-01-08', 'Bellissima macro!',94, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (198,= '1985-01-08', 'really pretty. it looks like there is a lady in the _center= _, blowing kisses!!',94, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (95= , '2264670815_82c5619ec6_o.jpg', '2264670815_82c5619ec6_o.jpg', 'Sport - 22= 64670815_82c5619ec6_o.jpg image', '2009-12-18', 5, 'Sony Alpha DSLR-A350',= 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 95); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (186,= '1985-01-08', 'fantastic shot !!!!!!',95, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (187,= '1985-01-08', 'I Think this is Art!',95, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (199,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',95, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (200,= '1985-01-08', 'I Think this is Art!',95, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (201,= '1985-01-08', 'nice shot =3D) ',95, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (96= , '2266019996_6b7fcb9d41_o.jpg', '2266019996_6b7fcb9d41_o.jpg', 'Sport - 22= 66019996_6b7fcb9d41_o.jpg image', '2009-12-18', 5, 'Canon Digital IXUS 80 = IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 96); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (188,= '1985-01-08', 'Beautiful colours. Nice close up. ',96, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (189,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',96, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (190,= '1985-01-08', '++Beautiful',96, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (191,= '1985-01-08', 'Wonderful.',96, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (202,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',96, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (203,= '1985-01-08', 'Gorgeous! Lovely color!',96, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (204,= '1985-01-08', '++Beautiful',96, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (205,= '1985-01-08', 'Stunning capture! :-)',96, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (97= , '2338319633_4feac41833_o.jpg', '2338319633_4feac41833_o.jpg', 'Sport - 23= 38319633_4feac41833_o.jpg image', '2009-12-18', 5, 'Pentax Optio E40', 102= 4, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 97); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (192,= '1985-01-08', 'Amazing shot..',97, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (206,= '1985-01-08', 'Wonderful.',97, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (207,= '1985-01-08', 'Wonderful.',97, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (208,= '1985-01-08', 'Stunning capture! :-)',97, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (98= , '2541626690_d6c35f7122_o.jpg', '2541626690_d6c35f7122_o.jpg', 'Sport - 25= 41626690_d6c35f7122_o.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 104= 0', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 98); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (209,= '1985-01-08', 'that is a beautiful flower with great colours ',98, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (210,= '1985-01-08', 'Wonderful.',98, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (211,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',98, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (212,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',98, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (99= , '2760610141_8a56e469d0_o.jpg', '2760610141_8a56e469d0_o.jpg', 'Sport - 27= 60610141_8a56e469d0_o.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917= , 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 99); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (213,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',99, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (214,= '1985-01-08', 'this is extremely Good:) Congratulations!',99, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 0, '2767537621_e378165405_o.jpg', '2767537621_e378165405_o.jpg', 'Sport - 2= 767537621_e378165405_o.jpg image', '2009-12-18', 5, 'BenQ DC E800', 1024, = 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 100); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 1, '2813129574_018acd119d_o.jpg', '2813129574_018acd119d_o.jpg', 'Sport - 2= 813129574_018acd119d_o.jpg image', '2009-12-18', 5, 'Konica Minolta', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 101); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (215,= '1985-01-08', '++Beautiful',101, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (216,= '1985-01-08', 'Perfecft!',101, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 2, '2832747707_fb68c8147f_o.jpg', '2832747707_fb68c8147f_o.jpg', 'Sport - 2= 832747707_fb68c8147f_o.jpg image', '2009-12-18', 5, 'Panasonic', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 102); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (193,= '1985-01-08', 'I Think this is Art!',102, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (194,= '1985-01-08', 'nice shot =3D) ',102, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (195,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',102, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (217,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',102, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 3, '3037432738_e4b2388861_o.jpg', '3037432738_e4b2388861_o.jpg', 'Sport - 3= 037432738_e4b2388861_o.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 103); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (196,= '1985-01-08', 'Perfecft!',103, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (218,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',103, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (219,= '1985-01-08', 'whoah ! wonderful',103, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (220,= '1985-01-08', 'whoah ! wonderful',103, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (221,= '1985-01-08', 'Such a lovely colour azaga!',103, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 4, '413103429_50ff9d8ae3_o.jpg', '413103429_50ff9d8ae3_o.jpg', 'Sport - 413= 103429_50ff9d8ae3_o.jpg image', '2009-12-18', 5, 'Canon EOS 450D', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 104); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (197,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',104, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (198,= '1985-01-08', 'Amazing shot..',104, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (199,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',104, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (222,= '1985-01-08', 'Gorgeous! Lovely color!',104, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (223,= '1985-01-08', 'love every thing about this picture, really beautiful... :)= )',104, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (224,= '1985-01-08', 'really pretty. it looks like there is a lady in the _center= _, blowing kisses!!',104, 1); UPDATE Album set coveringImage_id=3D104 where id =3D 5; = --------------------------------------------------------------------- -- ALBUM - Water" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water images', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water pictures', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (6, 'Water'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 5, '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 117= 215467_5cccef9aaa_b.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77',= 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 105); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (200,= '1985-01-08', 'Fantastic job. Great light and color! Great shot!',105, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 6, '1323769314_fe850cd954_o.jpg', '1323769314_fe850cd954_o.jpg', 'Water - 1= 323769314_fe850cd954_o.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110= IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 106); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (201,= '1985-01-08', 'this is extremely Good:) Congratulations!',106, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (202,= '1985-01-08', 'nice shot =3D) ',106, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (203,= '1985-01-08', 'Very *lovely*',106, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (225,= '1985-01-08', 'Such a lovely colour azaga!',106, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (226,= '1985-01-08', 'Wonderful.',106, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 7, '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 205= 579493_baf0f850d1_o.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, = 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 107); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (204,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',107, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (227,= '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',107, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (228,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',107, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (229,= '1985-01-08', 'whoah ! wonderful',107, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 8, '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 2= 198502835_1644c8fde2_o.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 108); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (205,= '1985-01-08', 'Wonderful.',108, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (230,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',108, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (231,= '1985-01-08', 'this is extremely Good:) Congratulations!',108, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (232,= '1985-01-08', 'Stunning capture! :-)',108, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (233,= '1985-01-08', 'Bellissima macro!',108, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= 9, '2242254221_f2af58e243_o.jpg', '2242254221_f2af58e243_o.jpg', 'Water - 2= 242254221_f2af58e243_o.jpg image', '2009-12-18', 6, 'Canon Digital IXUS 80= IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 109); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (206,= '1985-01-08', 'Bellissima macro!',109, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (207,= '1985-01-08', 'Very *lovely*',109, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (208,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',109, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (234,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',109, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (235,= '1985-01-08', 'Perfecft!',109, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (236,= '1985-01-08', 'Beautiful colours. Nice close up. ',109, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 0, '3170219697_4d259ff802_o.jpg', '3170219697_4d259ff802_o.jpg', 'Water - 3= 170219697_4d259ff802_o.jpg image', '2009-12-18', 6, 'Pentax Optio E40', 10= 24, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 110); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (209,= '1985-01-08', 'Stunning capture! :-)',110, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (237,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',110, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (238,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',110, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 1, '3200123361_cfd16bb12a_o.jpg', '3200123361_cfd16bb12a_o.jpg', 'Water - 3= 200123361_cfd16bb12a_o.jpg image', '2009-12-18', 6, 'Olympus Stylus mju 10= 40', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 111); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (210,= '1985-01-08', 'that is a beautiful flower with great colours ',111, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (211,= '1985-01-08', 'Gorgeous! Lovely color!',111, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (239,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',111, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (240,= '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -ni= ce- details!!!',111, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 2, '3253676430_b14ae3f5c9_o.jpg', '3253676430_b14ae3f5c9_o.jpg', 'Water - 3= 253676430_b14ae3f5c9_o.jpg image', '2009-12-18', 6, 'BBK DP810', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 112); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (212,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',112, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (213,= '1985-01-08', 'Beautiful colours. Nice close up. ',112, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (214,= '1985-01-08', 'Perfecft!',112, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (215,= '1985-01-08', 'Amazing shot..',112, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 3, '336589255_6a8ba0ebb6_o.jpg', '336589255_6a8ba0ebb6_o.jpg', 'Water - 336= 589255_6a8ba0ebb6_o.jpg image', '2009-12-18', 6, 'BenQ DC E800', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 113); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (216,= '1985-01-08', 'nice shot =3D) ',113, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (217,= '1985-01-08', 'that is a beautiful flower with great colours ',113, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (218,= '1985-01-08', 'Amazing shot..',113, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (241,= '1985-01-08', 'Amazing shot..',113, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (242,= '1985-01-08', 'Gorgeous! Lovely color!',113, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (243,= '1985-01-08', 'Wonderful.',113, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (244,= '1985-01-08', 'Stunning capture! :-)',113, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 4, '3411135019_0cc403fcb8_o.jpg', '3411135019_0cc403fcb8_o.jpg', 'Water - 3= 411135019_0cc403fcb8_o.jpg image', '2009-12-18', 6, 'Konica Minolta', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 114); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (219,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',114, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 5, '3416553183_2564d26ef1_b.jpg', '3416553183_2564d26ef1_b.jpg', 'Water - 3= 416553183_2564d26ef1_b.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 115); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (245,= '1985-01-08', 'Bellissima macro!',115, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (246,= '1985-01-08', 'Perfecft!',115, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (247,= '1985-01-08', 'Bellissima macro!',115, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 6, '381634787_f52e84a5af_o.jpg', '381634787_f52e84a5af_o.jpg', 'Water - 381= 634787_f52e84a5af_o.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 1917= , 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 116); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (220,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',116, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (221,= '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',116, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (222,= '1985-01-08', 'Very *lovely*',116, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (248,= '1985-01-08', 'really pretty. it looks like there is a lady in the _center= _, blowing kisses!!',116, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (249,= '1985-01-08', 'Amazing shot..',116, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (250,= '1985-01-08', 'Amazing shot..',116, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 7, '396318116_a47c4a8392_o.jpg', '396318116_a47c4a8392_o.jpg', 'Water - 396= 318116_a47c4a8392_o.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 1= 917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 117); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (251,= '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',117, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (252,= '1985-01-08', 'Perfecft!',117, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 8, '412426470_47be44c1f1_o.jpg', '412426470_47be44c1f1_o.jpg', 'Water - 412= 426470_47be44c1f1_o.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77',= 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 118); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (223,= '1985-01-08', 'Such a lovely colour azaga!',118, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (224,= '1985-01-08', 'Such a lovely colour azaga!',118, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (225,= '1985-01-08', 'whoah ! wonderful',118, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (253,= '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',118, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (254,= '1985-01-08', 'Very *lovely*',118, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= 9, '7530427_08dcad5953_o.jpg', '7530427_08dcad5953_o.jpg', 'Water - 7530427= _08dcad5953_o.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 IS', 102= 4, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 119); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (226,= '1985-01-08', 'nice shot =3D) ',119, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (227,= '1985-01-08', 'I Think this is Art!',119, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (228,= '1985-01-08', 'Such a lovely colour azaga!',119, 2); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12= 0, '767963055_bd02f406d6_o.jpg', '767963055_bd02f406d6_o.jpg', 'Water - 767= 963055_bd02f406d6_o.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, = 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 120); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (255,= '1985-01-08', 'Perfecft!',120, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (256,= '1985-01-08', 'Gorgeous! Lovely color!',120, 1); UPDATE Album set coveringImage_id=3D120 where id =3D 6; = Modified: trunk/examples/photoalbum/source/ejb/sql/short/import.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/photoalbum/source/ejb/sql/short/import.sql 2009-05-06 15= :48:08 UTC (rev 14038) +++ trunk/examples/photoalbum/source/ejb/sql/short/import.sql 2009-05-06 17= :34:23 UTC (rev 14039) @@ -2,169 +2,191 @@ INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (2, 'Nick', 'Curtis', 'nkur= tis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964'= , '1978-01-08', 1, 0, true); INSERT INTO User(id, firstname, secondname, email, login, passwordHash, bi= rthdate, sex, hasAvatar, preDefined) VALUES (3, 'John', 'Smith', 'jsmi= th(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964'= , '1970-01-08', 1, 0, true); = -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature images', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature images', 1, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature images', 2, '2009-12-18', true); -INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature images', 3, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (1, 'Nature', 'Nature pictures', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (2, 'Sport', 'Nature pictures', 1, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (3, 'Water', 'Nature pictures', 2, '2009-12-18', true); +INSERT INTO Shelf(id, name, description, owner_id, created, shared) VALUES= (4, 'Flowers', 'Nature pictures', 3, '2009-12-18', true); --------------------------------------------------------------------- -- ALBUM - Animals" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals images', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (0, 'An= imals', 'Animals pictures', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (0, 'Animals'); = INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (0,= '1750979205_6e51b47ce9_o.jpg', '1750979205_6e51b47ce9_o.jpg', 'Animals - 1= 750979205_6e51b47ce9_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024= , 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 0); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (1,= '1906662004_655d0f6ccf_o.jpg', '1906662004_655d0f6ccf_o.jpg', 'Animals - 1= 906662004_655d0f6ccf_o.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T7= 7', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (0, '= 1985-01-08', 'Gorgeous! Lovely color!',1, 3); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (2,= '2090459727_f2888e5cbe_o.jpg', '2090459727_f2888e5cbe_o.jpg', 'Animals - 2= 090459727_f2888e5cbe_o.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110= IS', 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (1, '= 1985-01-08', 'Amazing shot..',2, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (2, '= 1985-01-08', 'Wonderful.',2, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (3, '= 1985-01-08', 'that is a beautiful flower with great colours ',2, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (4, '= 1985-01-08', 'Beautiful colours. Nice close up. ',2, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (0, '= 1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice= - details!!!',2, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (1, '= 1985-01-08', 'Gorgeous! Lovely color!',2, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (2, '= 1985-01-08', 'Gorgeous! Lovely color!',2, 1); INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (3,= '2297752925_de29b5fb10_o.jpg', '2297752925_de29b5fb10_o.jpg', 'Animals - 2= 297752925_de29b5fb10_o.jpg image', '2009-12-18', 0, 'Nikon D60', 1024, 191= 7, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (5, '= 1985-01-08', 'Fantastic job. Great light and color! Great shot!',3, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (6, '= 1985-01-08', '++Beautiful',3, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (7, '= 1985-01-08', 'Gorgeous! Lovely color!',3, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (8, '= 1985-01-08', 'Superb Shot and so beautiful Colors !!! ',3, 1); -UPDATE Album set coveringImage_id=3D3 where id =3D 0; + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (3, '= 1985-01-08', 'Superb Shot and so beautiful Colors !!! ',3, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (4, '= 1985-01-08', 'whoah ! wonderful',3, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (5, '= 1985-01-08', 'Such a lovely colour azaga!',3, 3); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (4,= '2298556444_2151b7a6c4_o.jpg', '2298556444_2151b7a6c4_o.jpg', 'Animals - 2= 298556444_2151b7a6c4_o.jpg image', '2009-12-18', 0, 'Sony Alpha DSLR-A350'= , 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 4); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (6, '= 1985-01-08', 'Beautiful colours. Nice close up. ',4, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (7, '= 1985-01-08', 'Amazing shot..',4, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (8, '= 1985-01-08', '++Beautiful',4, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (9, '= 1985-01-08', 'Beautiful colours. Nice close up. ',4, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (5,= '2508246015_313952406c_o.jpg', '2508246015_313952406c_o.jpg', 'Animals - 2= 508246015_313952406c_o.jpg image', '2009-12-18', 0, 'Canon Digital IXUS 80= IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(0, 5); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (10, = '1985-01-08', 'Perfecft!',5, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (11, = '1985-01-08', 'whoah ! wonderful',5, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (12, = '1985-01-08', 'Gorgeous! Lovely color!',5, 3); +UPDATE Album set coveringImage_id=3D5 where id =3D 0; = --------------------------------------------------------------------- -- ALBUM - Cars" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars images', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (1, 'Ca= rs', 'Cars pictures', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (1, 'Cars'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (4,= '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 190193= 308_ce2a4de5fa_o.jpg image', '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024= , 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 4); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (5,= '1941230817_bcce17b8ef_o.jpg', '1941230817_bcce17b8ef_o.jpg', 'Cars - 1941= 230817_bcce17b8ef_o.jpg image', '2009-12-18', 1, 'Canon Digital IXUS 80 IS= (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 5); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (9, '= 1985-01-08', 'Superb Shot and so beautiful Colors !!! ',5, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (10, = '1985-01-08', 'nice shot =3D) ',5, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (11, = '1985-01-08', 'nice shot =3D) ',5, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (12, = '1985-01-08', 'Such a lovely colour azaga!',5, 3); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (6,= '2151423750_129317a034_o.jpg', '2151423750_129317a034_o.jpg', 'Cars - 2151= 423750_129317a034_o.jpg image', '2009-12-18', 1, 'Pentax Optio E40', 1024,= 1917, 768, '2009-12-01', true, true); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (6,= '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 190193= 308_ce2a4de5fa_o.jpg image', '2009-12-18', 1, 'Pentax Optio E40', 1024, 19= 17, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 6); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (13, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',6, 1); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (7,= '2233985073_9a3fd7d3ac_b.jpg', '2233985073_9a3fd7d3ac_b.jpg', 'Cars - 2233= 985073_9a3fd7d3ac_b.jpg image', '2009-12-18', 1, 'Olympus Stylus mju 1040'= , 1024, 1917, 768, '2009-12-01', true, true); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (7,= '1941230817_bcce17b8ef_o.jpg', '1941230817_bcce17b8ef_o.jpg', 'Cars - 1941= 230817_bcce17b8ef_o.jpg image', '2009-12-18', 1, 'Olympus Stylus mju 1040'= , 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 7); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (14, = '1985-01-08', 'Gorgeous! Lovely color!',7, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (15, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',7, 2); -UPDATE Album set coveringImage_id=3D7 where id =3D 1; + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (13, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',7, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (14, = '1985-01-08', 'Very *lovely*',7, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (15, = '1985-01-08', 'Very *lovely*',7, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (16, = '1985-01-08', 'Gorgeous! Lovely color!',7, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8,= '2151423750_129317a034_o.jpg', '2151423750_129317a034_o.jpg', 'Cars - 2151= 423750_129317a034_o.jpg image', '2009-12-18', 1, 'BBK DP810', 1024, 1917, = 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 8); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (17, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',8, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (9,= '2233985073_9a3fd7d3ac_b.jpg', '2233985073_9a3fd7d3ac_b.jpg', 'Cars - 2233= 985073_9a3fd7d3ac_b.jpg image', '2009-12-18', 1, 'BenQ DC E800', 1024, 191= 7, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 9); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (18, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',9, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (19, = '1985-01-08', 'Bellissima macro!',9, 1); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= , '2386071696_2b4e84eddb_o.jpg', '2386071696_2b4e84eddb_o.jpg', 'Cars - 238= 6071696_2b4e84eddb_o.jpg image', '2009-12-18', 1, 'Konica Minolta', 1024, = 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 10); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (20, = '1985-01-08', 'Such a lovely colour azaga!',10, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= , '3089719367_a03a2b55a4_b.jpg', '3089719367_a03a2b55a4_b.jpg', 'Cars - 308= 9719367_a03a2b55a4_b.jpg image', '2009-12-18', 1, 'Panasonic', 1024, 1917,= 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(1, 11); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (21, = '1985-01-08', 'Very *lovely*',11, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (22, = '1985-01-08', 'whoah ! wonderful',11, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (23, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',11, 2); +UPDATE Album set coveringImage_id=3D11 where id =3D 1; = --------------------------------------------------------------------- -- ALBUM - Monuments and just buildings" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings images', 4, '20= 09-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (2, 'Mo= numents and just buildings', 'Monuments and just buildings pictures', 4, '= 2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (2, 'Monuments and just buildings'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8,= '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[3= 03x457].jpg image', '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-1= 2-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 8); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (9,= '07[303x457].jpg', '07[303x457].jpg', 'Monuments and just buildings - 07[3= 03x457].jpg image', '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '200= 9-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 9); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10= , '1805365000_ca64d20b10_o.jpg', '1805365000_ca64d20b10_o.jpg', 'Monuments = and just buildings - 1805365000_ca64d20b10_o.jpg image', '2009-12-18', 2, = 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 10); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (16, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',10, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (17, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',10, 1); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11= , '1[303x457].jpg', '1[303x457].jpg', 'Monuments and just buildings - 1[303= x457].jpg image', '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-= 01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 11); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (18, = '1985-01-08', '++Beautiful',11, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (19, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',11, 2); -UPDATE Album set coveringImage_id=3D11 where id =3D 2; +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12= , '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[= 303x457].jpg image', '2009-12-18', 2, 'LG LDC-A310', 1024, 1917, 768, '200= 9-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 12); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (24, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',12, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (25, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',12, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (26, = '1985-01-08', 'that is a beautiful flower with great colours ',12, 1); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (13= , '07[303x457].jpg', '07[303x457].jpg', 'Monuments and just buildings - 07[= 303x457].jpg image', '2009-12-18', 2, 'Canon EOS 450D', 1024, 1917, 768, '= 2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 13); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (27, = '1985-01-08', 'Wonderful.',13, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (28, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',13, 3); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (14= , '1805365000_ca64d20b10_o.jpg', '1805365000_ca64d20b10_o.jpg', 'Monuments = and just buildings - 1805365000_ca64d20b10_o.jpg image', '2009-12-18', 2, = 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(2, 14); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (29, = '1985-01-08', 'Stunning capture! :-)',14, 1); +UPDATE Album set coveringImage_id=3D14 where id =3D 2; = --------------------------------------------------------------------- -- ALBUM - Nature" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature images', 2, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (3, 'Na= ture', 'Nature pictures', 2, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (3, 'Nature'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12= , '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image', = '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 12); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (13= , '1[305x457].jpg', '1[305x457].jpg', 'Nature - 1[305x457].jpg image', '20= 09-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 13); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (20, = '1985-01-08', 'Amazing shot..',13, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (21, = '1985-01-08', 'Very *lovely*',13, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (22, = '1985-01-08', 'Amazing shot..',13, 2); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (14= , '273927725_c9f5ef5952_o.jpg', '273927725_c9f5ef5952_o.jpg', 'Nature - 273= 927725_c9f5ef5952_o.jpg image', '2009-12-18', 3, 'Sony CyberShot DSC-T77',= 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 14); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (23, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',14, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (24, = '1985-01-08', 'Beautiful colours. Nice close up. ',14, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (25, = '1985-01-08', 'Bellissima macro!',14, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (26, = '1985-01-08', 'Perfecft!',14, 1); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (15= , '2[303x457].jpg', '2[303x457].jpg', 'Nature - 2[303x457].jpg image', '20= 09-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', tr= ue, true); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (15= , '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image', = '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01',= true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 15); -UPDATE Album set coveringImage_id=3D15 where id =3D 3; +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16= , '1[305x457].jpg', '1[305x457].jpg', 'Nature - 1[305x457].jpg image', '20= 09-12-18', 3, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 16); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (30, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',16, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (31, = '1985-01-08', 'Amazing shot..',16, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (32, = '1985-01-08', 'Gorgeous! Lovely color!',16, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (33, = '1985-01-08', 'Very *lovely*',16, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (17= , '273927725_c9f5ef5952_o.jpg', '273927725_c9f5ef5952_o.jpg', 'Nature - 273= 927725_c9f5ef5952_o.jpg image', '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1= 024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 17); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (34, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',17, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (35, = '1985-01-08', 'Bell=C3=ADsima.!!! saludos.',17, 3); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (18= , '2[303x457].jpg', '2[303x457].jpg', 'Nature - 2[303x457].jpg image', '20= 09-12-18', 3, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917,= 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 18); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (36, = '1985-01-08', 'this is extremely Good:) Congratulations!',18, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (37, = '1985-01-08', 'whoah ! wonderful',18, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (19= , '3392730627_1cdb18cba6_o.jpg', '3392730627_1cdb18cba6_o.jpg', 'Nature - 3= 392730627_1cdb18cba6_o.jpg image', '2009-12-18', 3, 'Pentax Optio E40', 10= 24, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 19); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20= , '3392993334_36d7f097df_o.jpg', '3392993334_36d7f097df_o.jpg', 'Nature - 3= 392993334_36d7f097df_o.jpg image', '2009-12-18', 3, 'Olympus Stylus mju 10= 40', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(3, 20); +UPDATE Album set coveringImage_id=3D20 where id =3D 3; = --------------------------------------------------------------------- -- ALBUM - Portrait" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait images', 3, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (4, 'Po= rtrait', 'Portrait pictures', 3, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (4, 'Portrait'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16= , '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',= '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 16); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (17= , '1033975999_7e058fcf1c_o.jpg', '1033975999_7e058fcf1c_o.jpg', 'Portrait -= 1033975999_7e058fcf1c_o.jpg image', '2009-12-18', 4, 'Sony Alpha DSLR-A35= 0', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 17); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (27, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',17, 1); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (18= , '1516027705_ddff0a70dd_o.jpg', '1516027705_ddff0a70dd_o.jpg', 'Portrait -= 1516027705_ddff0a70dd_o.jpg image', '2009-12-18', 4, 'Canon Digital IXUS = 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 18); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (28, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',18, 3); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (19= , '1799039821_b6ee53167c_o.jpg', '1799039821_b6ee53167c_o.jpg', 'Portrait -= 1799039821_b6ee53167c_o.jpg image', '2009-12-18', 4, 'Pentax Optio E40', = 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 19); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (29, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',19, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (30, = '1985-01-08', 'this is extremely Good:) Congratulations!',19, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (31, = '1985-01-08', 'Amazing shot..',19, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (32, = '1985-01-08', 'this is extremely Good:) Congratulations!',19, 1); -UPDATE Album set coveringImage_id=3D19 where id =3D 4; +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (21= , '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',= '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 21); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (38, = '1985-01-08', 'Bellissima macro!',21, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (39, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',21, 1); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (40, = '1985-01-08', 'I Think this is Art!',21, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (41, = '1985-01-08', 'this is extremely Good:) Congratulations!',21, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (22= , '1033975999_7e058fcf1c_o.jpg', '1033975999_7e058fcf1c_o.jpg', 'Portrait -= 1033975999_7e058fcf1c_o.jpg image', '2009-12-18', 4, 'BenQ DC E800', 1024= , 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 22); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (23= , '1516027705_ddff0a70dd_o.jpg', '1516027705_ddff0a70dd_o.jpg', 'Portrait -= 1516027705_ddff0a70dd_o.jpg image', '2009-12-18', 4, 'Konica Minolta', 10= 24, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(4, 23); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (42, = '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',23, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (43, = '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',23, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (44, = '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',23, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (45, = '1985-01-08', 'Amazing shot..',23, 1); +UPDATE Album set coveringImage_id=3D23 where id =3D 4; = --------------------------------------------------------------------- -- ALBUM - Sport" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport images', 4, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (5, 'Sp= ort', 'Sport pictures', 4, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (5, 'Sport'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20= , '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 1031= 93233_860c47c909_o.jpg image', '2009-12-18', 5, 'Olympus Stylus mju 1040',= 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 20); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (33, = '1985-01-08', 'Such a lovely colour azaga!',20, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (34, = '1985-01-08', 'Beautiful colours. Nice close up. ',20, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (35, = '1985-01-08', 'Beautiful colours. Nice close up. ',20, 1); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (21= , '1350250361_2d963dd4e7_o.jpg', '1350250361_2d963dd4e7_o.jpg', 'Sport - 13= 50250361_2d963dd4e7_o.jpg image', '2009-12-18', 5, 'BBK DP810', 1024, 1917= , 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 21); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (22= , '2042654579_d25c0db64f_o.jpg', '2042654579_d25c0db64f_o.jpg', 'Sport - 20= 42654579_d25c0db64f_o.jpg image', '2009-12-18', 5, 'BenQ DC E800', 1024, 1= 917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 22); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (23= , '2158910844_e5a6deeeab_o.jpg', '2158910844_e5a6deeeab_o.jpg', 'Sport - 21= 58910844_e5a6deeeab_o.jpg image', '2009-12-18', 5, 'Konica Minolta', 1024,= 1917, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 23); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (36, = '1985-01-08', 'Perfecft!',23, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (37, = '1985-01-08', 'fantastic shot !!!!!!',23, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (38, = '1985-01-08', 'fantastic shot !!!!!!',23, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (39, = '1985-01-08', '++Beautiful',23, 2); -UPDATE Album set coveringImage_id=3D23 where id =3D 5; +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24= , '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 1031= 93233_860c47c909_o.jpg image', '2009-12-18', 5, 'Panasonic', 1024, 1917, 7= 68, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 24); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (46, = '1985-01-08', 'Bellissima macro!',24, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (25= , '1350250361_2d963dd4e7_o.jpg', '1350250361_2d963dd4e7_o.jpg', 'Sport - 13= 50250361_2d963dd4e7_o.jpg image', '2009-12-18', 5, 'LG LDC-A310', 1024, 19= 17, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 25); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (47, = '1985-01-08', 'Perfecft!',25, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (48, = '1985-01-08', 'Stunning capture! :-)',25, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (49, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',25, 2); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26= , '2042654579_d25c0db64f_o.jpg', '2042654579_d25c0db64f_o.jpg', 'Sport - 20= 42654579_d25c0db64f_o.jpg image', '2009-12-18', 5, 'Canon EOS 450D', 1024,= 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(5, 26); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (50, = '1985-01-08', 'Beautiful colours. Nice close up. ',26, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (51, = '1985-01-08', 'Perfecft!',26, 2); +UPDATE Album set coveringImage_id=3D26 where id =3D 5; = --------------------------------------------------------------------- -- ALBUM - Water" --------------------------------------------------------------------- -INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water images', 1, '2009-12-18'); +INSERT INTO Album(id, name, description, shelf_id, created) VALUES (6, 'Wa= ter', 'Water pictures', 1, '2009-12-18'); INSERT INTO MetaTag(id, tag) VALUES (6, 'Water'); = -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24= , '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 1172= 15467_5cccef9aaa_b.jpg image', '2009-12-18', 6, 'Panasonic', 1024, 1917, 7= 68, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 24); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (40, = '1985-01-08', 'this is extremely Good:) Congratulations!',24, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (41, = '1985-01-08', 'really pretty. it looks like there is a lady in the _center_= , blowing kisses!!',24, 3); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (25= , '1323769314_fe850cd954_o.jpg', '1323769314_fe850cd954_o.jpg', 'Water - 13= 23769314_fe850cd954_o.jpg image', '2009-12-18', 6, 'LG LDC-A310', 1024, 19= 17, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 25); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (42, = '1985-01-08', 'Such a lovely colour azaga!',25, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (43, = '1985-01-08', 'that is a beautiful flower with great colours ',25, 3); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (44, = '1985-01-08', '++Beautiful',25, 2); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26= , '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 2055= 79493_baf0f850d1_o.jpg image', '2009-12-18', 6, 'Canon EOS 450D', 1024, 19= 17, 768, '2009-12-01', true, true); - INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 26); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (45, = '1985-01-08', 'fantastic shot !!!!!!',26, 2); -INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27= , '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 21= 98502835_1644c8fde2_o.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77= ', 1024, 1917, 768, '2009-12-01', true, true); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27= , '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 1172= 15467_5cccef9aaa_b.jpg image', '2009-12-18', 6, 'Sony CyberShot DSC-T77', = 1024, 1917, 768, '2009-12-01', true, true); INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 27); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (46, = '1985-01-08', 'Amazing shot..',27, 2); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (47, = '1985-01-08', 'fantastic shot !!!!!!',27, 1); - INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (48, = '1985-01-08', '++Beautiful',27, 2); -UPDATE Album set coveringImage_id=3D27 where id =3D 6; + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (52, = '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nic= e- details!!!',27, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (53, = '1985-01-08', 'love every thing about this picture, really beautiful... :))= ',27, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (54, = '1985-01-08', 'Perfecft!',27, 3); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (55, = '1985-01-08', 'Beautiful colours. Nice close up. ',27, 1); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (28= , '1323769314_fe850cd954_o.jpg', '1323769314_fe850cd954_o.jpg', 'Water - 13= 23769314_fe850cd954_o.jpg image', '2009-12-18', 6, 'Canon PowerShot SX110 = IS', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 28); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (56, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',28, 1); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (29= , '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 2055= 79493_baf0f850d1_o.jpg image', '2009-12-18', 6, 'Nikon D60', 1024, 1917, 7= 68, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 29); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (30= , '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 21= 98502835_1644c8fde2_o.jpg image', '2009-12-18', 6, 'Sony Alpha DSLR-A350',= 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 30); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (57, = '1985-01-08', 'Perfecft!',30, 1); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (31= , '2242254221_f2af58e243_o.jpg', '2242254221_f2af58e243_o.jpg', 'Water - 22= 42254221_f2af58e243_o.jpg image', '2009-12-18', 6, 'Canon Digital IXUS 80 = IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 31); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (58, = '1985-01-08', 'fantastic shot !!!!!!',31, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (59, = '1985-01-08', 'Bellissima macro!',31, 3); +INSERT INTO Image(id, name, path, description, created, album_id, cameraMo= del, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (32= , '3170219697_4d259ff802_o.jpg', '3170219697_4d259ff802_o.jpg', 'Water - 31= 70219697_4d259ff802_o.jpg image', '2009-12-18', 6, 'Pentax Optio E40', 102= 4, 1917, 768, '2009-12-01', true, true); + INSERT INTO Image_MetaTag(IMAGETAGS_ID, IMAGES_ID) VALUES(6, 32); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (60, = '1985-01-08', 'I Think this is Art!',32, 2); + INSERT INTO Comment(id, date, message, image_id, author_id) VALUES (61, = '1985-01-08', 'Fantastic job. Great light and color! Great shot!',32, 2); +UPDATE Album set coveringImage_id=3D32 where id =3D 6; = - Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[3= 03x457]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[3= 03x457]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[3= 03x457]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[3= 03x457]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/05[3= 03x457]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[3= 03x457]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[3= 03x457]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[3= 03x457]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[3= 03x457]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/07[3= 03x457]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805= 365000_ca64d20b10_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805= 365000_ca64d20b10_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805= 365000_ca64d20b10_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805= 365000_ca64d20b10_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1805= 365000_ca64d20b10_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457].jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/2/1[303= x457]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1031= 93233_860c47c909_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1031= 93233_860c47c909_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1031= 93233_860c47c909_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1031= 93233_860c47c909_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1031= 93233_860c47c909_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350= 250361_2d963dd4e7_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350= 250361_2d963dd4e7_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350= 250361_2d963dd4e7_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350= 250361_2d963dd4e7_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/1350= 250361_2d963dd4e7_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042= 654579_d25c0db64f_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042= 654579_d25c0db64f_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042= 654579_d25c0db64f_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042= 654579_d25c0db64f_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/2042= 654579_d25c0db64f_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Noname/4/5/21589= 10844_e5a6deeeab_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[3= 03x202]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[3= 03x202]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[3= 03x202]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[3= 03x202]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/02[3= 03x202]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033= 975999_7e058fcf1c_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033= 975999_7e058fcf1c_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033= 975999_7e058fcf1c_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1033= 975999_7e058fcf1c_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516= 027705_ddff0a70dd_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516= 027705_ddff0a70dd_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516= 027705_ddff0a70dd_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516= 027705_ddff0a70dd_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/1516= 027705_ddff0a70dd_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/examples/photoalbum/source/web/Upload/short/Viking/3/4/17990= 39821_b6ee53167c_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/17= 50979205_6e51b47ce9_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/17= 50979205_6e51b47ce9_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/17= 50979205_6e51b47ce9_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/17= 50979205_6e51b47ce9_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/17= 50979205_6e51b47ce9_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/19= 06662004_655d0f6ccf_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/19= 06662004_655d0f6ccf_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/19= 06662004_655d0f6ccf_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/19= 06662004_655d0f6ccf_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/19= 06662004_655d0f6ccf_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/20= 90459727_f2888e5cbe_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/20= 90459727_f2888e5cbe_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/20= 90459727_f2888e5cbe_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/20= 90459727_f2888e5cbe_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/20= 90459727_f2888e5cbe_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22= 97752925_de29b5fb10_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22= 97752925_de29b5fb10_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22= 97752925_de29b5fb10_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22= 97752925_de29b5fb10_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22= 97752925_de29b5fb10_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/11= 7215467_5cccef9aaa_b_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/11= 7215467_5cccef9aaa_b_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/11= 7215467_5cccef9aaa_b_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/11= 7215467_5cccef9aaa_b_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/13= 23769314_fe850cd954_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/13= 23769314_fe850cd954_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/13= 23769314_fe850cd954_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/13= 23769314_fe850cd954_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/13= 23769314_fe850cd954_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/20= 5579493_baf0f850d1_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/20= 5579493_baf0f850d1_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/20= 5579493_baf0f850d1_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/20= 5579493_baf0f850d1_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/20= 5579493_baf0f850d1_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/21= 98502835_1644c8fde2_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/21= 98502835_1644c8fde2_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/21= 98502835_1644c8fde2_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/21= 98502835_1644c8fde2_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/21= 98502835_1644c8fde2_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01= [303x202]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01= [303x202]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01= [303x202]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01= [303x202]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/01= [303x202]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[= 305x457]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[= 305x457]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[= 305x457]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[= 305x457]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/1[= 305x457]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/27= 3927725_c9f5ef5952_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/27= 3927725_c9f5ef5952_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/27= 3927725_c9f5ef5952_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/27= 3927725_c9f5ef5952_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[= 303x457]_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[= 303x457]_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[= 303x457]_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[= 303x457]_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/2[= 303x457]_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============6993905188278858154==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 15:49:48 2009 Content-Type: multipart/mixed; boundary="===============4617494889123202153==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14040 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit. Date: Wed, 06 May 2009 15:46:48 -0400 Message-ID: --===============4617494889123202153== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-06 15:46:48 -0400 (Wed, 06 May 2009) New Revision: 14040 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRe= nderer.java Log: https://jira.jboss.org/jira/browse/RF-5104 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/Abstract= TableRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableR= enderer.java 2009-05-06 17:34:23 UTC (rev 14039) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableR= enderer.java 2009-05-06 19:46:48 UTC (rev 14040) @@ -779,7 +779,7 @@ if (imageUrl !=3D null) { writer.startElement(HTML.IMG_ELEMENT, column); writer.writeAttribute(HTML.src_ATTRIBUTE, imageUrl, null); - writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, "", null); writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null); writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-header-sort-im= g rich-sort-icon", null); --===============4617494889123202153==-- From richfaces-svn-commits at lists.jboss.org Wed May 6 15:50:11 2009 Content-Type: multipart/mixed; boundary="===============9112563705894297071==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14041 - trunk/ui/paint2D/src/main/config/component. Date: Wed, 06 May 2009 15:47:11 -0400 Message-ID: --===============9112563705894297071== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-06 15:47:11 -0400 (Wed, 06 May 2009) New Revision: 14041 Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml Log: https://jira.jboss.org/jira/browse/RF-7044 Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2009-05-06 19:46= :48 UTC (rev 14040) +++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2009-05-06 19:47= :11 UTC (rev 14041) @@ -109,7 +109,7 @@ java.lang.String - " " + ""
      =
      --===============1395882725595502574==-- From richfaces-svn-commits at lists.jboss.org Thu May 7 07:12:36 2009 Content-Type: multipart/mixed; boundary="===============4869126601770437026==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14052 - in trunk/examples/photoalbum/source/web/Upload/short/amarkhel: 1/6 and 3 other directories. Date: Thu, 07 May 2009 07:09:28 -0400 Message-ID: --===============4869126601770437026== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-07 07:09:28 -0400 (Thu, 07 May 2009) New Revision: 14052 Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/229855644= 4_2151b7a6c4_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/250824601= 5_313952406c_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/224225422= 1_f2af58e243_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/317021969= 7_4d259ff802_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/ trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/190193308= _ce2a4de5fa_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/194123081= 7_bcce17b8ef_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/215142375= 0_129317a034_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/223398507= 3_9a3fd7d3ac_b_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/238607169= 6_2b4e84eddb_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/308971936= 7_a03a2b55a4_b_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339273062= 7_1cdb18cba6_o_small80.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o_medium.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o_small120.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o_small160.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o_small200.jpg trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/339299333= 4_36d7f097df_o_small80.jpg Log: add images Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/22985= 56444_2151b7a6c4_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2298556444_2151b7a6c4_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/0/25082= 46015_313952406c_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/0/2508246015_313952406c_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/22422= 54221_f2af58e243_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/2242254221_f2af58e243_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/1/6/31702= 19697_4d259ff802_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/1/6/3170219697_4d259ff802_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19019= 3308_ce2a4de5fa_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/190193308_ce2a4de5fa_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/19412= 30817_bcce17b8ef_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/1941230817_bcce17b8ef_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/21514= 23750_129317a034_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2151423750_129317a034_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/22339= 85073_9a3fd7d3ac_b_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2233985073_9a3fd7d3ac_b_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/23860= 71696_2b4e84eddb_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/2386071696_2b4e84eddb_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/1/30897= 19367_a03a2b55a4_b_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/1/3089719367_a03a2b55a4_b_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33927= 30627_1cdb18cba6_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392730627_1cdb18cba6_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o_medium.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o_medium.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o_small120.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o_small120.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o_small160.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o_small160.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o_small200.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o_small200.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/photoalbum/source/web/Upload/short/amarkhel/2/3/33929= 93334_36d7f097df_o_small80.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/examples/photoalbum/source/web/Upload/short/amar= khel/2/3/3392993334_36d7f097df_o_small80.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============4869126601770437026==-- From richfaces-svn-commits at lists.jboss.org Thu May 7 07:14:51 2009 Content-Type: multipart/mixed; boundary="===============5556465897197153762==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14053 - in trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: handler and 1 other directories. Date: Thu, 07 May 2009 07:11:43 -0400 Message-ID: --===============5556465897197153762== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-07 07:11:43 -0400 (Thu, 07 May 2009) New Revision: 14053 Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/generator/ResourcesGenerator.java trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/generator/ScriptAssembler.java trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/generator/StyleAssembler.java trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/handler/ComponentsHandler.java trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/c= dk/rd/mojo/ResourceDependencyMojo.java Log: https://jira.jboss.org/jira/browse/RF-7052 Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/generator/ResourcesGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/ResourcesGenerator.java 2009-05-07 11:09:28 UTC (rev 14052) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/ResourcesGenerator.java 2009-05-07 11:11:43 UTC (rev 14053) @@ -28,7 +28,6 @@ import java.util.List; = import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugin.logging.SystemStreamLog; = /** * @author Anton Belevich @@ -38,7 +37,7 @@ = private File assemblyFile; = - private Log log =3D new SystemStreamLog(); + private Log log; = private Collection resources; = @@ -48,6 +47,9 @@ = private ResourceAssembler assembler; = = + public ResourcesGenerator(Log log) { + this.log =3D log; + } = public void doAssembly() { if(resources !=3D null) { @@ -69,6 +71,7 @@ for (String resourceName: resources) { = URL resource =3D getResourceURL(resourceName); + log.info("concatenate resource: " + resource); if(resource !=3D null) { if (assembler !=3D null) { assembler.assembly(resource); @@ -107,9 +110,10 @@ } = try { - assemblyFile.createNewFile(); + assemblyFile.createNewFile(); = + = } catch (IOException e) { - log.error("Error create assembly File: " + assemblyFile.getAbsolutePat= h(),e); + log.error("Error create assembly File: " + assemblyFile.getPath(),e); } = assembler.writeToFile(assemblyFile); Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/generator/ScriptAssembler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/ScriptAssembler.java 2009-05-07 11:09:28 UTC (rev 14052) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/ScriptAssembler.java 2009-05-07 11:11:43 UTC (rev 14053) @@ -27,7 +27,6 @@ import java.net.URL; = import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugin.logging.SystemStreamLog; import org.codehaus.plexus.util.IOUtil; = /** @@ -36,14 +35,18 @@ */ public class ScriptAssembler implements ResourceAssembler { = - protected Log log =3D new SystemStreamLog(); + protected Log log; = + = private StringBuilder builder =3D new StringBuilder(); = = + public ScriptAssembler(Log log) { + this.log =3D log; + } + = public void assembly(URL resource) { - log.info("process resource : " + resource.getFile()); - = + = try { builder.append(IOUtil.toString(resource.openStream())); builder.append("\n"); @@ -60,6 +63,7 @@ FileWriter fileWriter =3D new FileWriter(file); = try { + log.info("write result to the: " + file.getPath()); IOUtil.copy(builder.toString(), fileWriter); } finally { fileWriter.close(); Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/generator/StyleAssembler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/StyleAssembler.java 2009-05-07 11:09:28 UTC (rev 14052) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/generator/StyleAssembler.java 2009-05-07 11:11:43 UTC (rev 14053) @@ -44,18 +44,24 @@ = public class StyleAssembler implements ResourceAssembler { = - protected Log log =3D new SystemStreamLog(); + protected Log log =3D new SystemStreamLog(); = = private VelocityComponent velocityComponent; = private StringBuilder builder =3D new StringBuilder(); = + public StyleAssembler(Log log) { + this.log =3D log; + } = public void assembly(URL resource) { = String file =3D resource.getFile(); - log.info("process resource: " + file); = + if(log.isDebugEnabled()) { + log.debug("process resource: " + file); + } = + = try { InputStream resourceInputStream =3D resource.openStream(); = @@ -101,7 +107,7 @@ context.put("content", builder); VelocityEngine engine =3D velocityComponent.getEngine(); FileWriter fileWriter =3D new FileWriter(file); - = + log.info("write result to the: " + file.getPath()); try { Template velocityTemplate =3D engine.getTemplate("templates12/xcss.vm= "); velocityTemplate.merge(context, fileWriter); Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/handler/ComponentsHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/handler/ComponentsHandler.java 2009-05-07 11:09:28 UTC (rev 14052) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/handler/ComponentsHandler.java 2009-05-07 11:11:43 UTC (rev 14053) @@ -25,6 +25,8 @@ import java.util.Map; import java.util.Set; = +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugin.logging.SystemStreamLog; import org.codehaus.plexus.util.SelectorUtils; import org.richfaces.cdk.rd.Component; import org.richfaces.cdk.rd.Components; @@ -39,6 +41,8 @@ = private String [] INCLUDE_ALL_PATTERN =3D {"**"}; = + protected Log log; + = private Map components; = private Set scripts =3D new LinkedHashSet(); @@ -61,7 +65,9 @@ = private String [] componentExcludes; = - = + public ComponentsHandler(Log log) { + this.log =3D log; + } @Override public void endElement(String uri, String localName, String name) throws = SAXException { = @@ -69,17 +75,27 @@ = if(namespaceIncludes =3D=3D null) { namespaceIncludes =3D INCLUDE_ALL_PATTERN; + = + if(log.isDebugEnabled()) { + log.debug("use default include patterns for namespaces"); + } } = if(doMatch(namespaceIncludes, uri, true)){ - = + = if(!doMatch(namespaceExcludes, uri, true)) { = Components library =3D components.get(uri); List components =3D library.getComponents(); = = if (componentIncludes =3D=3D null) { + = componentIncludes =3D INCLUDE_ALL_PATTERN; + = + if(log.isDebugEnabled()) { + log.debug("use default include patterns for components"); + } + = } = for(Component component : components ){ @@ -90,6 +106,9 @@ if(doMatch(componentIncludes, componentName,false)) { = if(!doMatch(componentExcludes, componentName,false)) { + = + log.info("process component: " + componentName); + = collectScripts(component); collectStyles(component); } @@ -100,10 +119,12 @@ = } = + } else if(log.isDebugEnabled()) { + log.debug("components from namespace " + uri + " are in excluded lis= t"); } - = + } else if(log.isDebugEnabled()) { + log.debug("components from namespace " + uri + " aren't in include li= st"); } - = } } = @@ -113,12 +134,17 @@ styleIncludes =3D INCLUDE_ALL_PATTERN; } = + if(log.isDebugEnabled()) { + log.debug("start collect styles from component: " + component.getCompo= nentName() ); + } + = for(String style : component.getStyles()) { = if(doMatch(styleIncludes, style, true)) { = if(!doMatch(styleExcludes, style, true)) { this.styles.add(style); + log.info("style " + style + " is collected"); } = } @@ -153,12 +179,17 @@ scriptIncludes =3D INCLUDE_ALL_PATTERN; } = + if(log.isDebugEnabled()) { + log.debug("start collect scripts from component: " + component.getComp= onentName() ); + } + = for(String script : component.getScripts()) { = if(doMatch(scriptIncludes, script, true)) { = if(!doMatch(scriptExcludes, script, true)) { this.scripts.add(script); + log.info("script " + script + " is collected"); } = } = Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/rich= faces/cdk/rd/mojo/ResourceDependencyMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-07 11:09:28 UTC (rev 14052) +++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/= cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-07 11:11:43 UTC (rev 14053) @@ -269,7 +269,7 @@ scriptFile.mkdirs(); } = = - ScriptAssembler scriptAssembler =3D new ScriptAssembler(); + ScriptAssembler scriptAssembler =3D new ScriptAssembler(getLog()); = getLog().info("Start merge scripts to the: " + scriptFile.getPath()); = @@ -285,7 +285,7 @@ if(!styleFile.exists()) { styleFile.mkdirs(); } = - StyleAssembler styleAssembler =3D new StyleAssembler(); + StyleAssembler styleAssembler =3D new StyleAssembler(getLog()); styleAssembler.setVelocityComponent(velocity); getLog().info("Start merge styles to the: " + styleFile.getPath()); = @@ -308,7 +308,7 @@ } = public void mergeResources(File assembly, ResourceAssembler assembler, Li= st beforeIncludes, List afterIncludes, Collection= resources) { - ResourcesGenerator styleGenerator =3D new ResourcesGenerator(); + ResourcesGenerator styleGenerator =3D new ResourcesGenerator(getLog()); styleGenerator.setAssembler(assembler); styleGenerator.setIncludesAfter(afterIncludes); styleGenerator.setIncludesBefore(beforeIncludes); @@ -351,7 +351,7 @@ = String [] collectedFiles =3D scanner.getIncludedFiles(); = - ComponentsHandler handler =3D new ComponentsHandler(); + ComponentsHandler handler =3D new ComponentsHandler(getLog()); handler.setComponents(components); handler.setScriptIncludes(scriptIncludes); handler.setScriptExcludes(scriptExcludes); @@ -371,11 +371,11 @@ File file =3D new File(webSourceDir,processFile); = if(file.exists()) { = - getLog().info("process file: " + file.getName()); + getLog().info("start process file: " + file.getPath()); try { saxParser.parse(file, handler); } catch (Exception e) { - getLog().error("Error process file: " + file.getAbsolutePath() + "\= n" + e.getMessage(), e); + getLog().error("Error process file: " + file.getPath() + "\n" + e.g= etMessage(), e); } = } = @@ -391,20 +391,22 @@ = try { resolver.resolve(artifact, Collections.EMPTY_LIST, localRepository); - getLog().info("artifact " + artifact.getFile().getAbsolutePath() + " i= s resolved"); + if(getLog().isDebugEnabled()) { + getLog().debug("artifact " + artifact.getFile().getPath() + " is reso= lved"); + } } catch (ArtifactResolutionException e) { - getLog().error("Error with resolve artifact " + artifact.getFile().get= AbsolutePath() + "\n" + e.getMessage(), e); + getLog().error("Error with resolve artifact " + artifact.getFile().get= Path() + "\n" + e.getMessage(), e); } catch (ArtifactNotFoundException e) { - getLog().error("Not found artifact " + artifact.getFile().getAbsoluteP= ath() + "\n" + e.getMessage(), e); + getLog().error("Not found artifact " + artifact.getFile().getPath() + = "\n" + e.getMessage(), e); } = File file =3D artifact.getFile(); = try { FileSystemManager manager =3D VFS.getManager(); - jarFileObjects =3D manager.resolveFile("jar:///" + file.getAbsolutePat= h()); + jarFileObjects =3D manager.resolveFile("jar:///" + file.getPath()); } catch (FileSystemException e) { - getLog().error("Error during processing file: " + file.getAbsolutePath= ()+ "\n" + e.getMessage(), e); + getLog().error("Error during processing file: " + file.getPath()+ "\n"= + e.getMessage(), e); } = } = --===============5556465897197153762==-- From richfaces-svn-commits at lists.jboss.org Thu May 7 07:18:48 2009 Content-Type: multipart/mixed; boundary="===============5870318019613643580==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14054 - in trunk/sandbox/samples/maven-rd-plugin-sample: src/main/resources/META-INF and 1 other directories. Date: Thu, 07 May 2009 07:15:39 -0400 Message-ID: --===============5870318019613643580== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-07 07:15:39 -0400 (Thu, 07 May 2009) New Revision: 14054 Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF= /resources-config.xml trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneMo= rePage.xhtml Log: Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-07 11:11:4= 3 UTC (rev 14053) +++ trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-05-07 11:15:3= 9 UTC (rev 14054) @@ -35,8 +35,8 @@ org.richfaces.cdk 3.3.1-SNAPSHOT - styles/all.js - scripts/all.xcss + scripts/custom-dependencies.js + css/custom-dependencies.xcss Modified: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/M= ETA-INF/resources-config.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-IN= F/resources-config.xml 2009-05-07 11:11:43 UTC (rev 14053) +++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-IN= F/resources-config.xml 2009-05-07 11:15:39 UTC (rev 14054) @@ -2,10 +2,10 @@ css/custom-dependencies.xcss - custom-dependencies.xcss + css/custom-dependencies.xcss scripts/custom-dependencies.js - custom-dependencies.js + scripts/custom-dependencies.js \ No newline at end of file Modified: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/page= s/oneMorePage.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneM= orePage.xhtml 2009-05-07 11:11:43 UTC (rev 14053) +++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneM= orePage.xhtml 2009-05-07 11:15:39 UTC (rev 14054) @@ -8,9 +8,8 @@ xmlns:c=3D"http://java.sun.com/jstl/core" = > - - + + #end + + #end + + #if(!${styles.isEmpty()}) + + #foreach($style in $styles) + + #end + + #end + +#end + + Modified: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templat= es12/faces-config.vm =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/f= aces-config.vm 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/f= aces-config.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -103,6 +103,22 @@ #end #end #end + +#foreach($renderer in $renderers) + #set($rendererClass =3D $renderkit.rendererClass($renderer.classname) ) + #if( $renderer.generate || $facesConfig.rendererExists("${rendererClass}"= )) + + ${renderer.family} + + ${renderer.name} + + + ${rendererClass} + + + #end +#end + #end = Copied: branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates= 12/resources-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/= generator/src/main/resources/META-INF/templates12/resources-dependencies.vm) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/r= esources-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/resources/META-INF/templates12/r= esources-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,31 @@ + + + $uri + +#foreach( $key in ${components.keySet()}) + + $key + + #set($componentEntry =3D ${components.get($key)}) + #set($scripts =3D ${componentEntry.get("scripts")}) + #set($styles =3D ${componentEntry.get("styles")}) + + #if(!${scripts.isEmpty()}) + + #foreach($script in $scripts) + + #end + + #end + + #if(!${styles.isEmpty()}) + + #foreach($style in $styles) + + #end + + #end + +#end + + Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/= xml/XMLBodyMergeTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XM= LBodyMergeTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XM= LBodyMergeTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.xml; = import junit.framework.TestCase; Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/= xml/XMLBodySerializerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XM= LBodySerializerTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XM= LBodySerializerTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.xml; = import java.io.ByteArrayInputStream; Modified: branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/= xml/XPathComparatorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XP= athComparatorTest.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/generator/src/test/java/org/ajax4jsf/builder/xml/XP= athComparatorTest.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.xml; = import java.io.ByteArrayInputStream; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/maven/MavenXMLMerge.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/MavenXMLMerge.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/MavenXMLMerge.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.maven; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/maven/VelocityTaglibMergeCallBack.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/VelocityTaglibMergeCallBack.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/VelocityTaglibMergeCallBack.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.maven; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/maven/XMLMergeCallback.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/XMLMergeCallback.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /maven/XMLMergeCallback.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.maven; = /** Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/AbstractCDKMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AbstractCDKMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AbstractCDKMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -30,7 +30,10 @@ import java.net.URLClassLoader; import java.util.Iterator; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; = +import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.project.MavenProject; @@ -40,7 +43,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import org.codehaus.plexus.velocity.DefaultVelocityComponent; import org.codehaus.plexus.velocity.VelocityComponent; = /** @@ -258,6 +260,10 @@ if(null =3D=3D taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + = + if (null =3D=3D taglib.getTlibVersion()) { + taglib.setTlibVersion(createTaglibVersionFromProjectVersion()); + } getLog().debug("Taglib uri is " + taglib.getUri()); getLog().debug("Taglib shortname is " + taglib.getShortName()); if (null !=3D library.getTaglibs() && library.getTaglibs().length > 0) { @@ -269,6 +275,17 @@ return taglib; } = + private String createTaglibVersionFromProjectVersion() { + Artifact artifact =3D project.getArtifact(); + String version =3D artifact.getVersion(); + Matcher matcher =3D Pattern.compile("^(\\d+(?:\\.\\d+)*)").matcher(versi= on); + if (matcher.find()) { + return matcher.group(1); + } + + return "1.2"; + } + protected void writeParsedTemplate(String templateName, VelocityContext c= ontext, File configFile) throws IOException, ResourceNotFoundException, Par= seErrorException, MethodInvocationException, Exception { File dir =3D configFile.getParentFile(); if(!dir.exists()){ @@ -333,9 +350,12 @@ if(null =3D=3D taglib.getTaglib()){ taglib.setTaglib(taglib.getShortName()); } + if (null =3D=3D taglib.getTlibVersion()) { + taglib.setTlibVersion(createTaglibVersionFromProjectVersion()); + } getLog().debug("Taglib uri is " + taglib.getUri()); getLog().debug("Taglib shortname is " + taglib.getShortName()); - = + getLog().debug("Taglib version is " + taglib.getTlibVersion()); } = } Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/bui= lder/mojo/AbstractCreateMojo.java (from rev 14244, branches/community/3.3.X= /cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreat= eMojo.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AbstractCreateMojo.java (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AbstractCreateMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,141 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.ajax4jsf.builder.mojo; + +import java.io.File; +import java.util.HashSet; +import java.util.Set; + +import org.aja4jsf.builder.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.velocity.VelocityContext; + +/** + * @author Nick Belaevski + * + */ +public abstract class AbstractCreateMojo extends AbstractCDKMojo { + + protected static final String SRC_MAIN_RESOURCES =3D "src/main/resources"; + + protected static final Set JAVA_RESERVED_WORDS; + + static{ + JAVA_RESERVED_WORDS =3D new HashSet(); + JAVA_RESERVED_WORDS.add("abstract"); + JAVA_RESERVED_WORDS.add("assert"); + JAVA_RESERVED_WORDS.add("boolean"); + JAVA_RESERVED_WORDS.add("break"); + JAVA_RESERVED_WORDS.add("byte"); + JAVA_RESERVED_WORDS.add("case"); + JAVA_RESERVED_WORDS.add("catch"); + JAVA_RESERVED_WORDS.add("char"); + JAVA_RESERVED_WORDS.add("class"); + JAVA_RESERVED_WORDS.add("const"); + JAVA_RESERVED_WORDS.add("continue"); + JAVA_RESERVED_WORDS.add("default"); + JAVA_RESERVED_WORDS.add("do"); + JAVA_RESERVED_WORDS.add("double"); + JAVA_RESERVED_WORDS.add("else"); + JAVA_RESERVED_WORDS.add("extends"); + JAVA_RESERVED_WORDS.add("false"); + JAVA_RESERVED_WORDS.add("final"); + JAVA_RESERVED_WORDS.add("finally"); + JAVA_RESERVED_WORDS.add("float"); + JAVA_RESERVED_WORDS.add("for"); + JAVA_RESERVED_WORDS.add("goto"); = + JAVA_RESERVED_WORDS.add("if"); + JAVA_RESERVED_WORDS.add("implements"); + JAVA_RESERVED_WORDS.add("import"); + JAVA_RESERVED_WORDS.add("instanceof"); + JAVA_RESERVED_WORDS.add("int"); + JAVA_RESERVED_WORDS.add("interface"); + JAVA_RESERVED_WORDS.add("long"); + JAVA_RESERVED_WORDS.add("native"); + JAVA_RESERVED_WORDS.add("new"); + JAVA_RESERVED_WORDS.add("null"); + JAVA_RESERVED_WORDS.add("package"); + JAVA_RESERVED_WORDS.add("private"); + JAVA_RESERVED_WORDS.add("protected"); + JAVA_RESERVED_WORDS.add("public"); + JAVA_RESERVED_WORDS.add("return"); + JAVA_RESERVED_WORDS.add("short"); + JAVA_RESERVED_WORDS.add("static"); + JAVA_RESERVED_WORDS.add("strictfp"); + JAVA_RESERVED_WORDS.add("super"); + JAVA_RESERVED_WORDS.add("switch"); + JAVA_RESERVED_WORDS.add("synchronized"); + JAVA_RESERVED_WORDS.add("this"); + JAVA_RESERVED_WORDS.add("throw"); + JAVA_RESERVED_WORDS.add("throws"); + JAVA_RESERVED_WORDS.add("transient"); + JAVA_RESERVED_WORDS.add("true"); + JAVA_RESERVED_WORDS.add("try"); + JAVA_RESERVED_WORDS.add("void"); + JAVA_RESERVED_WORDS.add("volatile"); + JAVA_RESERVED_WORDS.add("while"); + } + + protected void checkAndCreateDirectory(File directory) + throws MojoExecutionException { + getLog().debug("Checking directory " + directory + " for existence"); + if (!directory.exists()) { + directory.mkdirs(); + getLog().debug("Directory " + directory + " created"); + } + if (!directory.isDirectory()) { + throw new MojoExecutionException("Directory " + directory.getAbsolutePa= th() + " is not a Directory"); + } + } + + protected void filterJarResource(Resource template, Resource skinResource= , File baseDir, + VelocityContext context) throws Exception { + File newFile =3D new File(baseDir, skinResource.getPath()); + if (newFile.exists()) { + getLog().debug("File " + newFile + " already exists. Skipping."); + } else { + try { + writeParsedTemplate(template.getPath(), context, newFile); + } catch (Exception e) { + throw new MojoExecutionException("Unable to write file " + newFile, e); + } + } + } + = + protected boolean isValidJavaName(String name) { + return !JAVA_RESERVED_WORDS.contains(name); + } + = + protected boolean isValidPackageName(String packageName) { + if (packageName !=3D null) { + String[] packageNameSegments =3D packageName.split("\\."); + for (String packageNameSegment : packageNameSegments) { + if (!isValidJavaName(packageNameSegment)) { + return false; + } + } + } + + return true; + } + +} Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/AssemblyLibraryMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AssemblyLibraryMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/AssemblyLibraryMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -72,8 +72,8 @@ * criteria. for accepted modules, unpack it to classes directory, and put * config files in separate directories. 4. Append unpacked directory to * resources, included in result jar. 5. Merge all META-INF/faces-config.x= ml , - * *.tld, *.taglib.xml , resources-config.xml into ones. 6. append depende= ncies - * of included projects to this. + * *.tld, *.taglib.xml, *.component-dependencies.xml , resources-config.xm= l into ones. = + * 6. append dependencies of included projects to this. * = * @author shura * @goal assembly @@ -90,6 +90,8 @@ = private static final String RESOURCES_CONFIG_TEMPLATE =3D "resources-conf= ig.vm"; = + private static final String COMPONENT_DEPENDENCIES_TEMPLATE =3D "componen= t-dependencies.vm"; + private static final String XCSS_TEMPLATE =3D "xcss.vm"; = private static final String TLD_TEMPLATE =3D "tld.vm"; @@ -106,12 +108,19 @@ "library-class", "namespace", "tag", "function" }; = + private static final String[] DEPENDENCIES_TAG_NAMES =3D new String[] { + "component" + }; + private static final Comparator TLD_COMPARATOR =3D new NamesListCom= parator( new XPathComparator("listener-class/text()", "name/text()"), TLD_TAG_NA= MES); = private static final Comparator FACELET_COMPARATOR =3D new NamesLis= tComparator( new XPathComparator("function-name/text()", "tag-name/text()"), TAGLIB_= TAG_NAMES); = + private static final Comparator DEPENDENCIES_COMPARATOR =3D new Nam= esListComparator( + new XPathComparator("name/text()"), DEPENDENCIES_TAG_NAMES); + /** * Used to look up Artifacts in the remote repository. * = @@ -221,6 +230,11 @@ /** * @parameter */ + private String includeDependencies =3D "META-INF/*.component-dependencies= .xml"; + + /** + * @parameter + */ private String includeXcss =3D "**/*.xcss"; = /** @@ -264,6 +278,7 @@ mergeXML(models, "META-INF/resources-config.xml", null, RESOURCES_CONFIG_TEMPLATE, "/resource-config/resource", "name/text()", new VelocityContext(), resourcesConfig, false, null); + = if (null !=3D commonStyle) { File commonXcss =3D new File(outputDirectory, commonStyle); mergeXML(models, includeXcss, excludeXcss, XCSS_TEMPLATE, = @@ -301,10 +316,10 @@ } } } - generateTaglib(taglibModels, taglib); + generateTaglibAndDependencies(taglibModels, taglib); } } else { - generateTaglib(models, library.getTaglib()); + generateTaglibAndDependencies(models, library.getTaglib()); } } = @@ -312,7 +327,7 @@ * @param models * @throws MojoExecutionException */ - private void generateTaglib(List models, Taglib taglib) + private void generateTaglibAndDependencies(List models, Taglib tag= lib) throws MojoExecutionException { getLog().debug( "Assembly taglib for uri " + taglib.getUri() @@ -341,6 +356,14 @@ mergeXML(models, includeTaglib, null, TAGLIB_TEMPLATE, commonXPath, "tag= -name/text() | function-name/text()", new VelocityContext( taglibContext), faceletsTaglib, false, FACELET_COMPARATOR); getLog().debug("Write Facelets taglib " + faceletsTaglib.getPath()); + = + File dependenciesFile =3D new File(outputDirectory, "META-INF/" + + taglib.getTaglib() + ".component-dependencies.xml"); + commonXPath =3D "/components/component" + createTagCondition(taglib, "na= me"); + = + mergeXML(models, includeDependencies, null, COMPONENT_DEPENDENCIES_TEMPL= ATE, commonXPath, "name/text()", new VelocityContext( + taglibContext), dependenciesFile, false, DEPENDENCIES_COMPARATOR); + getLog().debug("Write dependencies file " + dependenciesFile.getPath()); } = /** @@ -715,6 +738,7 @@ resource.addExclude("META-INF/faces-config.xml"); resource.addExclude("META-INF/resources-config.xml"); resource.addExclude("META-INF/*.taglib.xml"); + resource.addExclude("META-INF/*.component-dependencies.xml"); resource.addExclude("META-INF/*.tld"); project.addResource(resource); = Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/CompileMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CompileMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CompileMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,13 +26,11 @@ import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; = import org.apache.commons.beanutils.PropertyUtils; -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Parent; import org.apache.maven.plugin.MojoExecutionException; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/CreateComponentMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateComponentMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateComponentMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,7 +26,6 @@ import java.util.List; = import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.velocity.VelocityContext; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/CreateSkinMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateSkinMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateSkinMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.ajax4jsf.builder.mojo; = import java.io.File; @@ -46,10 +67,8 @@ * @author Maksim Kaszynski * */ -public class CreateSkinMojo extends AbstractCDKMojo { +public class CreateSkinMojo extends AbstractCreateMojo { = - private static final String SRC_MAIN_RESOURCES =3D "src/main/resources"; - private static final String PROPERTIES =3D ".skin.properties"; = private static final String XCSS =3D ".xcss"; @@ -59,7 +78,7 @@ private static final String SRC_MAIN_CONFIG_RESOURCES =3D "src/main/confi= g/resources"; = private static final String META_INF_SKINS =3D "META-INF/skins/"; - + = /** * Name of base package of skin. * If it is not set, GroupId is used. @@ -138,8 +157,16 @@ getLog().debug("Skin name is supposed to be " + shortName); getLog().debug("Root package " + packageName); getLog().debug("Skin package is " + fullSkinName); - - + = + //RF-4023 + if (!isValidJavaName(skinName)){ + throw new MojoExecutionException("Invalid skin name '" + skinName + "'.= Please type another name."); + } + = + if (!isValidPackageName(packageName)) { + throw new MojoExecutionException("Invalid skin package '" + packageName= + "'. Please type another package."); + } + = SkinInfo skinInfoTemplate =3D new SkinInfo(); skinInfoTemplate.setShortName(shortName); skinInfoTemplate.setPackageName(fullSkinName.toLowerCase()); @@ -184,19 +211,6 @@ } } = - private void filterJarResource(Resource template, Resource skinResource, = File baseDir, VelocityContext context) throws Exception{ - File newFile =3D new File(baseDir, skinResource.getPath()); - if (newFile.exists()) { - getLog().debug("File " + newFile + " already exists. Skipping."); - } else { - try { - writeParsedTemplate(template.getPath(), context, newFile); - } catch (Exception e) { - throw new MojoExecutionException("Unable to write file " + newFile, e); - } - } - } - = private List filterComponentSkinTemplates(List jarTem= plates, SkinInfo skinInfo, File resourceDir) throws MojoExecutionException { List newResources =3D new ArrayList(jarTemplates.siz= e()); for (Resource jarTemplate : jarTemplates) { @@ -396,17 +410,6 @@ return pluginArtifact.getFile(); } = - private void checkAndCreateDirectory(File directory) throws MojoExecution= Exception { - getLog().debug("Checking directory " + directory + " for existence"); - if (!directory.exists()) { - directory.mkdirs(); - getLog().debug("Directory " + directory + " created"); - } - if (!directory.isDirectory()) { - throw new MojoExecutionException("Directory " + directory.getAbsolutePa= th() + " is not a Directory"); - } - } - private void addToResourceConfig(List resources, File resourceC= onfigFile) throws Exception{ ResourceConfig resourceConfig =3D null; = Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/bui= lder/mojo/CreateThemeMojo.java (from rev 14244, branches/community/3.3.X/cd= k/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.= java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateThemeMojo.java (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/CreateThemeMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,158 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.ajax4jsf.builder.mojo; + +import java.io.File; +import java.util.Locale; + +import org.aja4jsf.builder.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.velocity.VelocityContext; + +/** + * This mojo is intended to create new theme within existing project. + *

      Usage mvn cdk:add-theme -Dname=3D<themeName> [ -Dpa= ckage=3D<themePackage> ]

      + * This adds new theme named <themeName> to project resources/META-I= NF/themes folder.
      + * If package is not specified, it is set same as groupId.
      + * = + * Following parameters can be used + *
    • name - name of the theme. Required.
      • + *
    • package - base package of the theme. If not specif= ied, groupId is used
      • + * = + * @goal add-theme + * @requiresProject true + * = + * @author Nick Belaevski + */ +public class CreateThemeMojo extends AbstractCreateMojo { + + private static final String XCSS =3D ".xcss"; + + private static final String META_INF_THEMES =3D "META-INF/themes/"; + + private static final String XCSS_THEMES_PACKAGE =3D "/renderkit/html/css"; + + private static final String THEME_PROPERTIES =3D ".theme.properties"; + + private static final String RENDERKIT_THEMES =3D "renderkit.html"; + + /** + * Name of base package of theme. + * If it is not set, GroupId is used. + * @parameter expression=3D"${package}" default-value=3D"${project.groupI= d}" + */ + private String packageName; + = + = + /** + * Name of theme. Required parameter. + * @parameter expression=3D"${name}" + * @required + */ + private String themeName; + = + private String generateRendererName(String themeName) { + StringBuilder rendererTypeBuilder =3D new StringBuilder(); + rendererTypeBuilder.append(Character.toUpperCase(themeName.charAt(0))); + rendererTypeBuilder.append(themeName.subSequence(1, themeName.length())); + rendererTypeBuilder.append("Renderer"); + return rendererTypeBuilder.toString(); + } + = + private void generateTheme(String packageName, String themeName) throws M= ojoExecutionException, MojoFailureException { + Resource themeProperties =3D new Resource("theme/themes/theme.properties= "); + Resource themeXCSS =3D new Resource("theme/css/theme.xcss"); + Resource themeConfig =3D new Resource("theme/component/theme.xml"); + Resource themeTemplate =3D new Resource("theme/template/theme.jspx"); + = + File resourceDir =3D new File(project.getBasedir(), SRC_MAIN_RESOURCES); + = + String packagePath =3D packageName.replace('.', '/'); + String xcssPackagePath =3D packagePath + XCSS_THEMES_PACKAGE; + String rendererName =3D generateRendererName(themeName); + String rendererType =3D packageName + '.' + rendererName; + String rendererClassName =3D packageName + '.' + RENDERKIT_THEMES + '.' = + rendererName; + + getLog().debug("Relative path to package is " + packagePath); + + VelocityContext velocityMasterContext =3D new VelocityContext(); + velocityMasterContext.put("packagePath", packagePath); + velocityMasterContext.put("xcssPackagePath", xcssPackagePath); + velocityMasterContext.put("name", themeName); + velocityMasterContext.put("rendererType", rendererType); + velocityMasterContext.put("rendererClassName", rendererClassName); + = + Resource properties =3D new Resource(META_INF_THEMES + themeName + THEME= _PROPERTIES); + try { + filterJarResource(themeProperties, properties, resourceDir, velocityMas= terContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering = resource " + themeProperties + " into " + properties, e); + } + = + Resource xcss =3D new Resource(xcssPackagePath + '/' + themeName + XCSS); + try { + filterJarResource(themeXCSS, xcss, resourceDir, velocityMasterContext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering = resource " + themeXCSS + " into " + xcss, e); + } + = + File configDir =3D new File(project.getBasedir(), "src/main/config/compo= nent"); + Resource config =3D new Resource(themeName + ".xml"); + try { + filterJarResource(themeConfig, config, configDir, velocityMasterContext= ); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering = resource " + themeConfig + " into " + config, e); + } + + File templateDir =3D new File(project.getBasedir(), "src/main/templates"= ); + Resource template =3D new Resource(packagePath + '/' + themeName + ".jsp= x"); + try { + filterJarResource(themeTemplate, template, templateDir, velocityMasterC= ontext); + } catch (Exception e) { + throw new MojoExecutionException("An exception occured while filtering = resource " + themeTemplate + " into " + template, e); + } + } + + public void execute() throws MojoExecutionException, MojoFailureException= { + getLog().info("Executing " + project); + getLog().info("Generating Theme " + themeName); + + String themePackageName =3D packageName.replace('/', '.').toLowerCase(Lo= cale.US); + String shortName =3D themeName; + getLog().debug("Root package " + packageName); + getLog().debug("Theme package is " + themePackageName); + + if (!isValidJavaName(themeName)){ + throw new MojoExecutionException("Invalid theme name '" + themeName + "= '. Please type another name."); + } + + if (!isValidPackageName(packageName)) { + throw new MojoExecutionException("Invalid theme package '" + packageNam= e + "'. Please type another package."); + } + = + generateTheme(themePackageName, shortName); + = + getLog().info("Generating Theme successful"); + } + +} Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/GenerateMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/GenerateMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/GenerateMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -26,7 +26,6 @@ = import org.ajax4jsf.builder.config.BuilderConfig; import org.ajax4jsf.builder.config.ParsingException; -import org.ajax4jsf.builder.generator.ComponentGenerator; import org.ajax4jsf.builder.generator.ComponentGenerator2; import org.ajax4jsf.builder.generator.ComponentTagGenerator; import org.ajax4jsf.builder.generator.ConverterGenerator; @@ -40,6 +39,8 @@ import org.ajax4jsf.builder.generator.RenderKitBean; import org.ajax4jsf.builder.generator.RendererGenerator; import org.ajax4jsf.builder.generator.ResourcesConfigGenerator; +import org.ajax4jsf.builder.generator.ResourcesConfigParser; +import org.ajax4jsf.builder.generator.ResourcesDependenciesGenerator; import org.ajax4jsf.builder.generator.TagHandlerGenerator; import org.ajax4jsf.builder.generator.TaglibGenerator; import org.ajax4jsf.builder.generator.ValidatorGenerator; @@ -211,9 +212,23 @@ faceletsTaglibGenerator.createFiles(config); } = + ResourcesConfigParser resourcesConfigParser =3D new ResourcesConfigPar= ser(resourcesConfiguration, mavenLogger); + resourcesConfigParser.setTemplates(templatesDirectory); + resourcesConfigParser.parse(config); + = + if (taglib !=3D null) { + ResourcesDependenciesGenerator resourcesDependenciesGenerator =3D new= ResourcesDependenciesGenerator(resourcesConfiguration, mavenLogger); + resourcesDependenciesGenerator.setUri(taglib.getUri()); + resourcesDependenciesGenerator.setDependencyFile(new File(outputResou= rcesDirectory, = + "META-INF/" + taglib.getShortName() + ".component-dependencies.xml"= )); + resourcesDependenciesGenerator.setComponentDependencies(resourcesConf= igParser.getComponentResourcesMap()); + resourcesDependenciesGenerator.createFiles(config); + } + = // Generate resources configuration file resources-config.xml // for all images/scripts/css... ResourcesConfigGenerator resourcesConfigGenerator =3D new ResourcesCon= figGenerator(resourcesConfiguration, mavenLogger); + resourcesConfigGenerator.setResourcesConfigGeneratorBean(resourcesConf= igParser.getResourcesConfigGeneratorBean()); resourcesConfigGenerator.setInclude(resourcesInclude); resourcesConfigGenerator.setTemplates(templatesDirectory); resourcesConfigGenerator.setResourcesConfig(new File( Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/GenerateTestMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/GenerateTestMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/GenerateTestMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.ajax4jsf.builder.mojo; = import org.ajax4jsf.builder.config.BuilderConfig; @@ -6,8 +27,6 @@ import org.ajax4jsf.builder.maven.MavenLogger; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; -import org.apache.velocity.Template; = /** * = Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/SkinInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/SkinInfo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/SkinInfo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.mojo; = import java.util.ArrayList; Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/mojo/Taglib.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/Taglib.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /mojo/Taglib.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -21,7 +21,6 @@ = package org.ajax4jsf.builder.mojo; = -import java.io.File; = /** * @author shura @@ -39,7 +38,7 @@ = private String _displayName; = - private String _tlibVersion =3D "1.2"; + private String _tlibVersion =3D null; = private String _jspVersion ; = Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/b= uilder/velocity/ResourceLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /velocity/ResourceLoader.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder= /velocity/ResourceLoader.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,6 +1,24 @@ /** - * = + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA */ + package org.ajax4jsf.builder.velocity; = import java.io.InputStream; Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/calendar.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/calendar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/calendar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,126 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/calendar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk= -plugin/src/main/resources/skin/baseclasses/calendar.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/calendar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/calendar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,117 @@ + + + + + + \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/color-picker.xcss (from rev 14244, branches/community/3.3.X/cdk/maven= -cdk-plugin/src/main/resources/skin/baseclasses/color-picker.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/color-picker.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/color-picker.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,51 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/columns.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/columns.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/columns.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/combobox.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/combobox.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/combobox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,80 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/combobox.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk= -plugin/src/main/resources/skin/baseclasses/combobox.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/combobox.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/combobox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,75 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/component-control.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/component-control.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/component-control.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/context-menu.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/context-menu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/context-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,16 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/context-menu.xcss (from rev 14244, branches/community/3.3.X/cdk/maven= -cdk-plugin/src/main/resources/skin/baseclasses/context-menu.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/context-menu.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/context-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/core.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/core.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/core.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,11 +1,9 @@ - - + - - - + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/data-filter-slider.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-filter-slider.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-filter-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/data-filter-slider.xcss (from rev 14244, branches/community/3.3.X/cdk= /maven-cdk-plugin/src/main/resources/skin/baseclasses/data-filter-slider.xc= ss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-filter-slider.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-filter-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/data-table.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,72 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/data-table.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-c= dk-plugin/src/main/resources/skin/baseclasses/data-table.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,67 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/datascroller.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/datascroller.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/datascroller.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,26 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/datascroller.xcss (from rev 14244, branches/community/3.3.X/cdk/maven= -cdk-plugin/src/main/resources/skin/baseclasses/datascroller.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/datascroller.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/datascroller.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/drag-drop.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/drag-drop.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/drag-drop.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/drag-drop.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cd= k-plugin/src/main/resources/skin/baseclasses/drag-drop.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/drag-drop.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/drag-drop.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/dropdown-menu.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/dropdown-menu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/dropdown-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/dropdown-menu.xcss (from rev 14244, branches/community/3.3.X/cdk/mave= n-cdk-plugin/src/main/resources/skin/baseclasses/dropdown-menu.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/dropdown-menu.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/dropdown-menu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/editor.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-p= lugin/src/main/resources/skin/baseclasses/editor.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/editor.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/editor.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/effect.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/effect.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/effect.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/extended-data-table.xcss (from rev 14244, branches/community/3.3.X/cd= k/maven-cdk-plugin/src/main/resources/skin/baseclasses/extended-data-table.= xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/extended-data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/extended-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,51 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/file-upload.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/file-upload.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/file-upload.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,72 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/file-upload.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-= cdk-plugin/src/main/resources/skin/baseclasses/file-upload.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/file-upload.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/file-upload.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/functions.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/functions.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/functions.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/gmap.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/gmap.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/gmap.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/gmap.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plu= gin/src/main/resources/skin/baseclasses/gmap.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/gmap.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/gmap.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/inplace-input.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-input.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-input.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,52 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/inplace-input.xcss (from rev 14244, branches/community/3.3.X/cdk/mave= n-cdk-plugin/src/main/resources/skin/baseclasses/inplace-input.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-input.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-input.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,43 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/inplace-select.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-select.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-select.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,62 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/inplace-select.xcss (from rev 14244, branches/community/3.3.X/cdk/mav= en-cdk-plugin/src/main/resources/skin/baseclasses/inplace-select.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-select.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inplace-select.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,59 @@ + + + + + + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/inputnumber-slider.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-slider.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-slider.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,17 +1,19 @@ - - + - - - + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/inputnumber-spinner.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-spinner.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-spinner.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/inputnumber-spinner.xcss (from rev 14244, branches/community/3.3.X/cd= k/maven-cdk-plugin/src/main/resources/skin/baseclasses/inputnumber-spinner.= xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-spinner.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/inputnumber-spinner.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/insert.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/insert.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/insert.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/j-query.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/j-query.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/j-query.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/layout.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-p= lugin/src/main/resources/skin/baseclasses/layout.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/layout.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/layout.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/list-shuttle.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/list-shuttle.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/list-shuttle.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,41 +1,23 @@ - - + - - - + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/menu-components.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/menu-components.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/menu-components.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,64 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/menu-components.xcss (from rev 14244, branches/community/3.3.X/cdk/ma= ven-cdk-plugin/src/main/resources/skin/baseclasses/menu-components.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/menu-components.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/menu-components.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,63 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/message.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/message.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/message.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,24 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/message.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-= plugin/src/main/resources/skin/baseclasses/message.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/message.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/message.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/modal-panel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/modal-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/modal-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,34 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/modal-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-= cdk-plugin/src/main/resources/skin/baseclasses/modal-panel.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/modal-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/modal-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,35 @@ + + + + + + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/ordering-list.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/ordering-list.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/ordering-list.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,27 +1,15 @@ - - + - - - + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/paint2d.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/paint2d.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/paint2d.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +1,11 @@ - - + - - - + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/panel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-pl= ugin/src/main/resources/skin/baseclasses/panel.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/panelbar.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelbar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelbar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,20 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/panelbar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk= -plugin/src/main/resources/skin/baseclasses/panelbar.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelbar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelbar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/panelmenu.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelmenu.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/panelmenu.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,11 +1,9 @@ - - + - - - + \ No newline at end of file Modified: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/base= classes/pick-list.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/pick-list.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/pick-list.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,39 +1,21 @@ - - + - - - + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/progress-bar.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/progress-bar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/progress-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,36 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/progress-bar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven= -cdk-plugin/src/main/resources/skin/baseclasses/progress-bar.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/progress-bar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/progress-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,33 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/scrollable-data-table.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/scrollable-data-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/scrollable-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,46 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/scrollable-data-table.xcss (from rev 14244, branches/community/3.3.X/= cdk/maven-cdk-plugin/src/main/resources/skin/baseclasses/scrollable-data-ta= ble.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/scrollable-data-table.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/scrollable-data-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,43 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/separator.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/separator.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/separator.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/separator.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cd= k-plugin/src/main/resources/skin/baseclasses/separator.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/separator.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/separator.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/simple-toggle-panel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/simple-toggle-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/simple-toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,22 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/simple-toggle-panel.xcss (from rev 14244, branches/community/3.3.X/cd= k/maven-cdk-plugin/src/main/resources/skin/baseclasses/simple-toggle-panel.= xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/simple-toggle-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/simple-toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/spacer.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/spacer.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/spacer.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/spacer.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-p= lugin/src/main/resources/skin/baseclasses/spacer.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/spacer.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/spacer.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/suggestionbox.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/suggestionbox.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/suggestionbox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,32 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/suggestionbox.xcss (from rev 14244, branches/community/3.3.X/cdk/mave= n-cdk-plugin/src/main/resources/skin/baseclasses/suggestionbox.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/suggestionbox.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/suggestionbox.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tab-panel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tab-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tab-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,40 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/tab-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cd= k-plugin/src/main/resources/skin/baseclasses/tab-panel.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tab-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tab-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,35 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/toggle-panel.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/toggle-panel.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,16 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/toggle-panel.xcss (from rev 14244, branches/community/3.3.X/cdk/maven= -cdk-plugin/src/main/resources/skin/baseclasses/toggle-panel.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/toggle-panel.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/toggle-panel.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tool-bar.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tool-bar.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tool-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,18 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/tool-bar.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk= -plugin/src/main/resources/skin/baseclasses/tool-bar.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tool-bar.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tool-bar.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tooltip.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tooltip.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tooltip.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/tooltip.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-= plugin/src/main/resources/skin/baseclasses/tooltip.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tooltip.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tooltip.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tree-model.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree-model.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree-model.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tree-table.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree-table.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree-table.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,12 +0,0 @@ - - - - - - - - Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/tree.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,34 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/tree.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plu= gin/src/main/resources/skin/baseclasses/tree.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/tree.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,33 @@ + + + + + + \ No newline at end of file Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basec= lasses/virtual-earth.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/virtual-earth.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/virtual-earth.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,14 +0,0 @@ - - - - - - - - Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/basecl= asses/virtual-earth.xcss (from rev 14244, branches/community/3.3.X/cdk/mave= n-cdk-plugin/src/main/resources/skin/baseclasses/virtual-earth.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/virtual-earth.xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/skin/baseclasse= s/virtual-earth.xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/c= omponent-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/mave= n-cdk-plugin/src/main/resources/templates/component-dependencies.vm) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/compo= nent-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates/compo= nent-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,5 @@ + + + ${taglib.uri} +${content} + Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12= /component-dependencies.vm (from rev 14244, branches/community/3.3.X/cdk/ma= ven-cdk-plugin/src/main/resources/templates12/component-dependencies.vm) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/com= ponent-dependencies.vm (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/templates12/com= ponent-dependencies.vm 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,5 @@ + + + ${taglib.uri} +${content} + Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme (from= rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resource= s/theme) Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/compo= nent (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/mai= n/resources/theme/component) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/comp= onent/theme.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/= component/theme.xml 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component= /theme.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,10 +0,0 @@ - - - - - - ${rendererType} - org.richfaces.Page - - - \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/compo= nent/theme.xml (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plug= in/src/main/resources/theme/component/theme.xml) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component= /theme.xml (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/component= /theme.xml 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,10 @@ + + + + + + ${rendererType} + org.richfaces.Page + + + \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css (= from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/reso= urces/theme/css) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/= theme.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/= css/theme.xcss 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme= .xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/t= heme.xcss (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/sr= c/main/resources/theme/css/theme.xcss) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme= .xcss (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme= .xcss 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/templ= ate (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main= /resources/theme/template) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/temp= late/theme.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/= template/theme.jspx 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/= theme.jspx 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,55 +0,0 @@ - - - - - - - #{component.attributes['pageTitle']} - - - - = - - - - = -
      - -
      - = -
      - -
      - = -
      - - - -
      - = -
      - -
      - - - -       \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/templ= ate/theme.jspx (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plug= in/src/main/resources/theme/template/theme.jspx) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/= theme.jspx (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/template/= theme.jspx 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,55 @@ + + + + + + + #{component.attributes['pageTitle']} + + + + = + + + + = +
      + +
      + = +
      + +
      + = +
      + + + +
      + = +
      + +
      + + + +       \ No newline at end of file Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/theme= s (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/r= esources/theme/themes) Deleted: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/them= es/theme.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/resources/theme/= themes/theme.properties 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/th= eme.properties 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,2 +0,0 @@ -rendererType=3D${rendererType} -styleSheet=3Dresource\:///${xcssPackagePath}/${name}.xcss Copied: branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/theme= s/theme.properties (from rev 14244, branches/community/3.3.X/cdk/maven-cdk-= plugin/src/main/resources/theme/themes/theme.properties) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/th= eme.properties (rev 0) +++ branches/jsf2.0/cdk/maven-cdk-plugin/src/main/resources/theme/themes/th= eme.properties 2009-05-19 22:58:34 UTC (rev 14245) @@ -0,0 +1,2 @@ +rendererType=3D${rendererType} +styleSheet=3Dresource\:///${xcssPackagePath}/${name}.xcss Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/Aggregation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/Aggregation.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/Aggregation.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; @@ -16,7 +37,8 @@ public String[] excludes; public boolean removeIncluded =3D false; public boolean insertNewLine =3D false; - + public boolean insertSemicolon =3D false; + = public void run(File outputDirectory) throws Exception { if(null =3D=3D sourceDirectory){ sourceDirectory =3D outputDirectory; @@ -29,6 +51,9 @@ FileInputStream in =3D new FileInputStream(file); try { IOUtil.copy(in, out); + if (insertSemicolon) { + out.write(';'); + } if (insertNewLine) { out.write('\n'); } Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/ErrorReporter4Mojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/ErrorReporter4Mojo.java 2009-05-19 17:29:15 UTC (rev 14= 244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/ErrorReporter4Mojo.java 2009-05-19 22:58:34 UTC (rev 14= 245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import org.apache.maven.plugin.logging.Log; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/JSLintChecker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/JSLintChecker.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/JSLintChecker.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/JSLintMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/JSLintMojo.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/JSLintMojo.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = = Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/MojoSupport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/MojoSupport.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/MojoSupport.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/SourceFile.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/SourceFile.java 2009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/SourceFile.java 2009-05-19 22:58:34 UTC (rev 14245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/= alchim/mojo/yuicompressor/YuiCompressorMojo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/YuiCompressorMojo.java 2009-05-19 17:29:15 UTC (rev 142= 44) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim= /mojo/yuicompressor/YuiCompressorMojo.java 2009-05-19 22:58:34 UTC (rev 142= 45) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; Modified: branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/= alchim/mojo/yuicompressor/AggregationTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim= /mojo/yuicompressor/AggregationTestCase.java 2009-05-19 17:29:15 UTC (rev 1= 4244) +++ branches/jsf2.0/cdk/maven-javascript-plugin/src/test/java/net/sf/alchim= /mojo/yuicompressor/AggregationTestCase.java 2009-05-19 22:58:34 UTC (rev 1= 4245) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * YUI Compressor Maven Mojo + * + * Copyright (C) 2007 Alchim31 Team + * + * 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-130= 1 USA + */ + = package net.sf.alchim.mojo.yuicompressor; = import java.io.File; Copied: branches/jsf2.0/cdk/maven-resource-dependency-plugin (from rev 1424= 4, branches/community/3.3.X/cdk/maven-resource-dependency-plugin) Modified: branches/jsf2.0/cdk/maven-resource-dependency-plugin/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2= 009-05-19 17:29:15 UTC (rev 14244) +++ branches/jsf2.0/cdk/maven-resource-dependency-plugin/pom.xml 2009-05-19= 22:58:34 UTC (rev 14245) @@ -3,7 +3,7 @@ cdk org.richfaces - 3.3.2-SNAPSHOT + 4.0.0-SNAPSHOT = 4.0.0 @@ -12,7 +12,7 @@ = maven-resource-dependency-plugin maven-plugin - 3.3.2-SNAPSHOT + 4.0.0-SNAPSHOT maven-resource-dependency-plugin = = @@ -40,7 +40,7 @@ org.richfaces.cdk maven-cdk-plugin - 3.3.2-SNAPSHOT + 4.0.0-SNAPSHOT = Modified: branches/jsf2.0/framework/jsf-test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/framework/jsf-test/pom.xml 2009-05-19 17:29:15 UTC (rev= 14244) +++ branches/jsf2.0/framework/jsf-test/pom.xml 2009-05-19 22:58:34 UTC (rev= 14245) @@ -15,12 +15,12 @@ junit junit - 4.5 + 4.6 net.sourceforge.htmlunit htmlunit - 2.4 + 2.5 com.sun.faces @@ -40,7 +40,7 @@ net.sourceforge.htmlunit htmlunit-core-js - 2.4 + 2.5 net.sourceforge.cssparser @@ -65,7 +65,7 @@ net.sourceforge.nekohtml nekohtml - 1.9.11 + 1.9.12 xml-apis --===============3012468761385180050==-- From richfaces-svn-commits at lists.jboss.org Tue May 19 20:53:24 2009 Content-Type: multipart/mixed; boundary="===============5359037849856657529==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14246 - in branches/jsf2.0/cdk: generator and 3 other directories. Date: Tue, 19 May 2009 20:47:25 -0400 Message-ID: --===============5359037849856657529== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-19 20:47:25 -0400 (Tue, 19 May 2009) New Revision: 14246 Added: branches/jsf2.0/cdk/generator/src/main/xjb/ branches/jsf2.0/cdk/generator/src/main/xsd/ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd Removed: branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/ Modified: branches/jsf2.0/cdk/generator/pom.xml branches/jsf2.0/cdk/pom.xml Log: start converting cdk to jaxb-based parser. Modified: branches/jsf2.0/cdk/generator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/pom.xml 2009-05-19 22:58:34 UTC (rev 1424= 5) +++ branches/jsf2.0/cdk/generator/pom.xml 2009-05-20 00:47:25 UTC (rev 1424= 6) @@ -1,5 +1,7 @@ - + cdk org.richfaces @@ -26,32 +28,27 @@ junit junit - 3.8.1 + 4.6 test - ant - ant - 1.6.5 + freemarker + freemarker + 2.3.9 - velocity - velocity-dep - 1.4 + javax.xml.bind + jaxb-api + 2.1 - commons-beanutils - commons-beanutils - 1.6 + com.sun.xml.bind + jaxb-impl + 2.1.10 - commons-digester - commons-digester - 1.5 - - com.sun.faces - mojarra-jsf-api + jsf-api 2.0.0-SNAPSHOT @@ -62,32 +59,17 @@ javax.el el-api - 1.0 + 1.2 - el-impl - el-impl - 1.0 + org.jboss.el + jboss-el + 2.0.1.GA - qdox - qdox - 1.6 + xerces + xercesImpl + 2.9.1 - - cglib - cglib - 2.1_3 - - - wutka - dtdparser - 1.21 - - - xerces - xercesImpl - 2.8.1 - - + \ No newline at end of file Added: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd = (rev 0) +++ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-20 00:47:25 = UTC (rev 14246) @@ -0,0 +1,53 @@ + + + + $Id$ + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Property changes on: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jsf2.0/cdk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/pom.xml 2009-05-19 22:58:34 UTC (rev 14245) +++ branches/jsf2.0/cdk/pom.xml 2009-05-20 00:47:25 UTC (rev 14246) @@ -10,22 +10,6 @@ 4.0.0-SNAPSHOT pom JSF Components Development kit - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - - 1.5 - 1.5 - - - - - generator maven-cdk-plugin @@ -33,35 +17,6 @@ maven-archetype-jsf-component maven-archetype-jsfwebapp maven-archetype-plug-n-skin - = = - - - - clover - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - - false - - - false - - 1.5 - - - **/*.java - = - - - - - - - \ No newline at end of file --===============5359037849856657529==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 07:37:17 2009 Content-Type: multipart/mixed; boundary="===============0091434182454574905==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14247 - in branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes: shelf and 1 other directory. Date: Wed, 20 May 2009 07:31:13 -0400 Message-ID: --===============0091434182454574905== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-20 07:31:13 -0400 (Wed, 20 May 2009) New Revision: 14247 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/= includes/shelf.xhtml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/= includes/shelf/shelfInfo.xhtml Log: Link "View shelf" on shelf view page doesn't need https://jira.jboss.org/jira/browse/RF-7196 Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/= webapp/includes/shelf/shelfInfo.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/= webapp/includes/shelf.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============0091434182454574905==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 08:52:27 2009 Content-Type: multipart/mixed; boundary="===============0212159427085912184==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14248 - branches/community/3.3.X/ui/editor/src/main/templates. Date: Wed, 20 May 2009 08:46:23 -0400 Message-ID: --===============0212159427085912184== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-20 08:46:22 -0400 (Wed, 20 May 2009) New Revision: 14248 Modified: branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx Log: https://jira.jboss.org/jira/browse/RF-7150 Modified: branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx 2009-= 05-20 11:31:13 UTC (rev 14247) +++ branches/community/3.3.X/ui/editor/src/main/templates/editor.jspx 2009-= 05-20 12:46:22 UTC (rev 14248) @@ -13,13 +13,14 @@ css/editor.xcss new org.ajax4jsf.javascript.AjaxScript(), new org.ajax4jsf.= javascript.PrototypeScript(), scripts/tiny_mce/tiny_mce_src.js, scripts/edi= tor.js + +
      = -
      = = -
      +
      --===============0212159427085912184==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 09:39:37 2009 Content-Type: multipart/mixed; boundary="===============1236318096446479625==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14249 - in branches/community/3.3.X/test-applications/seleniumTest: richfaces/src/main/webapp/layout and 1 other directories. Date: Wed, 20 May 2009 09:33:32 -0400 Message-ID: --===============1236318096446479625== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-20 09:33:32 -0400 (Wed, 20 May 2009) New Revision: 14249 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/ma= in/webapp/layout/layout.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/te= st/java/org/richfaces/SeleniumTestBase.java Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 12:46:22 UTC (rev 14248) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 13:33:32 UTC (rev 14249) @@ -21,7 +21,7 @@ openqa OpenQA Repository - http://archiva.openqa.org/repository/releases + http://nexus.openqa.org/content/repositories/releases default false @@ -33,7 +33,7 @@ openqa-snapshots OpenQA Snapshots Repository - http://archiva.openqa.org/repository/snapshots + http://nexus.openqa.org/content/repositories/snapshots default true @@ -207,22 +207,34 @@ jdk15       - org.openqa.selenium.client-drivers + org.seleniumhq.selenium.core + selenium-core + 1.0-SNAPSHOT + test + + + org.seleniumhq.selenium.client-drivers selenium-java-client-driver 1.0-SNAPSHOT test - org.openqa.selenium.server + org.seleniumhq.selenium.client-drivers + selenium-java-client-driver + 1.0-SNAPSHOT + test + + + org.seleniumhq.selenium.server selenium-server-coreless 1.0-SNAPSHOT test - + org.richfaces.ui Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces= /src/main/webapp/layout/layout.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces= /src/test/java/org/richfaces/SeleniumTestBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/t= est/java/org/richfaces/SeleniumTestBase.java 2009-05-20 12:46:22 UTC (rev 1= 4248) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/t= est/java/org/richfaces/SeleniumTestBase.java 2009-05-20 13:33:32 UTC (rev 1= 4249) @@ -127,7 +127,7 @@ config.setFirefoxProfileTemplate(new File(getFirefoxTemplate())); } config.setUserExtensions(new File(getClass().getClassLoader().getR= esource("script/selenium/user-extensions.js").toURI())); - config.setMultiWindow(false); + config.setSingleWindow(true); //TODO only for test config.setPort(16334); seleniumServer =3D new SeleniumServer(false, config); --===============1236318096446479625==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 10:59:35 2009 Content-Type: multipart/mixed; boundary="===============7913431463846644280==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14250 - in branches/community/3.3.X/examples/photoalbum/source: ejb and 2 other directories. Date: Wed, 20 May 2009 10:53:30 -0400 Message-ID: --===============7913431463846644280== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-20 10:53:29 -0400 (Wed, 20 May 2009) New Revision: 14250 Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/= WEB-INF/components.xml branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/= WEB-INF/web.xml Log: add profile full into pom.xml https://jira.jboss.org/jira/browse/RF-7201 Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05= -20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-05= -20 14:53:29 UTC (rev 14250) @@ -107,16 +107,16 @@ validate - copy-resources + copy-resources ${project.build.directory}/resources-filtered - - src/main/resources-filtered - true - - + + src/main/resources-filtered + true + + Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-20 = 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-05-20 = 14:53:29 UTC (rev 14250) @@ -37,6 +37,8 @@ short short environment/dev + true + 2 @@ -105,11 +107,31 @@ = + short + + short + short + environment/dev + + + + + full + + full + full + environment/dev + + + + livedemo full full environment/prod + false + -1 Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05= -20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-05= -20 14:53:29 UTC (rev 14250) @@ -314,10 +314,29 @@ - = + + org.apache.maven.plugins maven-war-plugin + + + + ${basedir}/src/main/webapp/WEB-INF + + + components.xml + web.xml + + WEB-INF + true + + + + + + maven-war-plugin + Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/= webapp/WEB-INF/components.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp= /WEB-INF/components.xml 2009-05-20 13:33:32 UTC (rev 14249) +++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp= /WEB-INF/components.xml 2009-05-20 14:53:29 UTC (rev 14250) @@ -20,7 +20,7 @@ http://jboss.com/products/seam/mail http://jboss.com/prod= ucts/seam/mail-2.1.0.xsd http://jboss.com/products/seam/components http://jboss.co= m/products/seam/components-2.1.0.xsd"> = - + /WEB-INF/tags/photoalbum-taglib.xml = - + ${environment.facelets.REFRESH_PERIOD} + = org.richfaces.LoadScriptStrategy --===============7913431463846644280==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 11:28:24 2009 Content-Type: multipart/mixed; boundary="===============4980894838508468765==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14251 - branches/community/3.3.X/samples/richfaces-demo. Date: Wed, 20 May 2009 11:22:18 -0400 Message-ID: --===============4980894838508468765== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-20 11:22:18 -0400 (Wed, 20 May 2009) New Revision: 14251 Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: richfaces-demo: TLD docs build moved into "release" profile Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 14:5= 3:29 UTC (rev 14250) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 15:2= 2:18 UTC (rev 14251) @@ -26,73 +26,12 @@ http://repository.jboss.com/maven2/ - + = richfaces-demo - maven-dependency-plugin - - - unpack - generate-resources - - unpack - - - - - org.richfaces.ui - richfaces-ui - ${project.version} - - - ${project.build.directory}/richfaces - false - true - - - - - - org.codehaus.mojo - exec-maven-plugin - - - tlddoc - process-resources - - java - - - - - - taglibrarydoc - tlddoc - 1.3 - - - - false - true - - taglibrarydoc - tlddoc - - com.sun.tlddoc.TLDDoc - - -d - ${project.build.directory}/${project.build.finalName= }/WEB-INF/tlddoc - -xslt - ${basedir}/src/main/xslt/tlddoc - ${project.build.directory}/richfaces/META-INF/ajax4j= sf.tld - ${project.build.directory}/richfaces/META-INF/rich.t= ld - - - - maven-compiler-plugin 1.5 @@ -117,6 +56,67 @@ release + + maven-dependency-plugin + + + unpack + generate-resources + + unpack + + + + + org.richfaces.ui + richfaces-ui + ${project.version} + + + ${project.build.directory}/richfaces + false + true + + + + + + org.codehaus.mojo + exec-maven-plugin + + + tlddoc + process-resources + + java + + + + + + taglibrarydoc + tlddoc + 1.3 + + + + false + true + + taglibrarydoc + tlddoc + + com.sun.tlddoc.TLDDoc + + -d + ${project.build.directory}/${project.build.finalName}/WEB-IN= F/tlddoc + -xslt + ${basedir}/src/main/xslt/tlddoc + ${project.build.directory}/richfaces/META-INF/ajax4jsf.tld + ${project.build.directory}/richfaces/META-INF/rich.tld + + + maven-war-plugin @@ -400,5 +400,5 @@ - + --===============4980894838508468765==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 12:08:11 2009 Content-Type: multipart/mixed; boundary="===============4950264447771629641==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14252 - branches/community/3.3.X/test-applications/seleniumTest. Date: Wed, 20 May 2009 12:02:05 -0400 Message-ID: --===============4950264447771629641== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-20 12:02:04 -0400 (Wed, 20 May 2009) New Revision: 14252 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 15:22:18 UTC (rev 14251) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 16:02:04 UTC (rev 14252) @@ -19,7 +19,7 @@ - openqa + nexus-openqa OpenQA Repository http://nexus.openqa.org/content/repositories/releases default @@ -31,7 +31,7 @@ - openqa-snapshots + nexus-openqa-snapshots OpenQA Snapshots Repository http://nexus.openqa.org/content/repositories/snapshots default --===============4950264447771629641==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 12:14:39 2009 Content-Type: multipart/mixed; boundary="===============2950961994679303865==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14253 - branches/community/3.3.X/test-applications/seleniumTest. Date: Wed, 20 May 2009 12:08:33 -0400 Message-ID: --===============2950961994679303865== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-20 12:08:32 -0400 (Wed, 20 May 2009) New Revision: 14253 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml Log: RF-7083 Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 16:02:04 UTC (rev 14252) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-05= -20 16:08:32 UTC (rev 14253) @@ -219,12 +219,6 @@ test       - org.seleniumhq.selenium.client-drivers - selenium-java-client-driver - 1.0-SNAPSHOT - test - - org.seleniumhq.selenium.server selenium-server-coreless 1.0-SNAPSHOT --===============2950961994679303865==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 13:11:34 2009 Content-Type: multipart/mixed; boundary="===============7645097734430404014==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14254 - branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts. Date: Wed, 20 May 2009 13:05:27 -0400 Message-ID: --===============7645097734430404014== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-20 13:05:26 -0400 (Wed, 20 May 2009) New Revision: 14254 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces= /renderkit/html/scripts/modalPanel.js Log: https://jira.jboss.org/jira/browse/RF-7179 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/ri= chfaces/renderkit/html/scripts/modalPanel.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richface= s/renderkit/html/scripts/modalPanel.js 2009-05-20 16:08:32 UTC (rev 14253) +++ branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richface= s/renderkit/html/scripts/modalPanel.js 2009-05-20 17:05:26 UTC (rev 14254) @@ -333,19 +333,9 @@ newLastPanel.enableInnerSelects(); } } else { - var children =3D document.body.childNodes; - for (var k =3D 0; k < children.length; k++) { - var child =3D children[k]; - = - if (!child.getElementsByTagName) { - continue; - } - = - var selects =3D child.getElementsByTagName("SELECT"); - - for (var i =3D 0; i < selects.length; i++) { - this.enableSelect(selects[i]); - } + var selects =3D document.body.getElementsByTagName("SELECT"); + for (var i =3D 0; i < selects.length; i++) { + this.enableSelect(selects[i]); } } }, @@ -363,24 +353,28 @@ this.enableInnerSelects(); } else { //disable all outer = - var children =3D document.body.childNodes; - for (var k =3D 0; k < children.length; k++) { - var child =3D children[k]; - = - if (child =3D=3D this.id) { - continue; + var selects =3D document.body.getElementsByTagName("SELECT"); + + var innerSelects =3D this.id.getElementsByTagName("SELECT"); + var firstInnerSelect =3D innerSelects[0]; + var lastInnerSelect =3D innerSelects[innerSelects.length - 1]; + = + var selectsAreInner =3D false; + = + for (var i =3D 0; i < selects.length; i++) { + var select =3D selects[i]; + if (select =3D=3D firstInnerSelect) { + selectsAreInner =3D true; } = - if (!child.getElementsByTagName) { - continue; + if (!selectsAreInner) { + this.disableSelect(select); } = - var selects =3D child.getElementsByTagName("SELECT"); - - for (var i =3D 0; i < selects.length; i++) { - this.disableSelect(selects[i]); + if (select =3D=3D lastInnerSelect) { + selectsAreInner =3D false; } - } = + } } }, = --===============7645097734430404014==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 14:06:35 2009 Content-Type: multipart/mixed; boundary="===============1380414891643770985==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14255 - in branches/community/3.3.X/examples/photoalbum/tests: src/test/java/org/richfaces/photoalbum and 1 other directory. Date: Wed, 20 May 2009 14:00:28 -0400 Message-ID: --===============1380414891643770985== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-20 14:00:28 -0400 (Wed, 20 May 2009) New Revision: 14255 Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ric= hfaces/photoalbum/SeleniumTestBase.java Log: RF-7083 Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-20 1= 7:05:26 UTC (rev 14254) +++ branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-05-20 1= 8:00:28 UTC (rev 14255) @@ -14,7 +14,7 @@ 4.2.3.GA ${project.basedir}/target/installs/jboss-${jboss.version}/jbo= ss-${jboss.version} - file:F:\Distribs\jboss-${jboss.version}.zip + file:d:\workspace\jboss-${jboss.version}.zip default = @@ -68,22 +68,28 @@ jdk15 - org.openqa.selenium.client-drivers + org.seleniumhq.selenium.core + selenium-core + 1.0-SNAPSHOT + test + + + org.seleniumhq.selenium.client-drivers selenium-java-client-driver 1.0-SNAPSHOT test - org.openqa.selenium.server + org.seleniumhq.selenium.server selenium-server-coreless 1.0-SNAPSHOT test - + org.apache.xmlgraphics Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/= org/richfaces/photoalbum/SeleniumTestBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/SeleniumTestBase.java 2009-05-20 17:05:26 UTC (rev 14254) +++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/SeleniumTestBase.java 2009-05-20 18:00:28 UTC (rev 14255) @@ -77,7 +77,7 @@ @BeforeSuite public void startSeleniumServer() throws Exception { RemoteControlConfiguration config =3D new RemoteControlConfigurati= on(); - config.setMultiWindow(false); + config.setSingleWindow(true); config.setPort(seleniumServerPort); config.setUserExtensions(new File(getClass().getClassLoader().getR= esource("script/selenium/user-extensions.js").toURI())); seleniumServer =3D new SeleniumServer(false, config); --===============1380414891643770985==-- From richfaces-svn-commits at lists.jboss.org Wed May 20 14:07:09 2009 Content-Type: multipart/mixed; boundary="===============4363201544714699859==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14256 - branches/community/3.3.X/samples/richfaces-demo. Date: Wed, 20 May 2009 14:01:02 -0400 Message-ID: --===============4363201544714699859== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-20 14:01:02 -0400 (Wed, 20 May 2009) New Revision: 14256 Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml Log: Changes from r14250 reverted Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 18:0= 0:28 UTC (rev 14255) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-05-20 18:0= 1:02 UTC (rev 14256) @@ -26,12 +26,73 @@ http://repository.jboss.com/maven2/ - + = richfaces-demo + maven-dependency-plugin + + + unpack + generate-resources + + unpack + + + + + org.richfaces.ui + richfaces-ui + ${project.version} + + + ${project.build.directory}/richfaces + false + true + + + + + + org.codehaus.mojo + exec-maven-plugin + + + tlddoc + process-resources + + java + + + + + + taglibrarydoc + tlddoc + 1.3 + + + + false + true + + taglibrarydoc + tlddoc + + com.sun.tlddoc.TLDDoc + + -d + ${project.build.directory}/${project.build.finalName= }/WEB-INF/tlddoc + -xslt + ${basedir}/src/main/xslt/tlddoc + ${project.build.directory}/richfaces/META-INF/ajax4j= sf.tld + ${project.build.directory}/richfaces/META-INF/rich.t= ld + + + + maven-compiler-plugin 1.5 @@ -56,67 +117,6 @@ release - - maven-dependency-plugin - - - unpack - generate-resources - - unpack - - - - - org.richfaces.ui - richfaces-ui - ${project.version} - - - ${project.build.directory}/richfaces - false - true - - - - - - org.codehaus.mojo - exec-maven-plugin - - - tlddoc - process-resources - - java - - - - - - taglibrarydoc - tlddoc - 1.3 - - - - false - true - - taglibrarydoc - tlddoc - - com.sun.tlddoc.TLDDoc - - -d - ${project.build.directory}/${project.build.finalName}/WEB-IN= F/tlddoc - -xslt - ${basedir}/src/main/xslt/tlddoc - ${project.build.directory}/richfaces/META-INF/ajax4jsf.tld - ${project.build.directory}/richfaces/META-INF/rich.tld - - - maven-war-plugin @@ -400,5 +400,5 @@ - + --===============4363201544714699859==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 07:54:28 2009 Content-Type: multipart/mixed; boundary="===============3828405648581180939==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14257 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf7203 and 1 other directory. Date: Thu, 21 May 2009 07:48:08 -0400 Message-ID: --===============3828405648581180939== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-21 07:48:07 -0400 (Thu, 21 May 2009) New Revision: 14257 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7203/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7203/Test.java Log: Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf7203/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7203/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7203/Test.java 2009-05-21 11:4= 8:07 UTC (rev 14257) @@ -0,0 +1,21 @@ +package org.richfaces.testng.rf7203; + +import org.richfaces.SeleniumTestBase; + +public class Test extends SeleniumTestBase{ + + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); + = + clickCommandAndWait("form:link"); + AssertVisible("form:contextMenu"); + clickAjaxCommandAndWait("form:contextMenu:menuItem"); = + } + = + @Override + public String getTestUrl() { = + return "pages/rf7203.xhtml"; + } + +} --===============3828405648581180939==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 08:12:11 2009 Content-Type: multipart/mixed; boundary="===============8030234258275406706==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14258 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt. Date: Thu, 21 May 2009 08:05:55 -0400 Message-ID: --===============8030234258275406706== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 08:05:54 -0400 (Thu, 21 May 2009) New Revision: 14258 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/pdf-comm= on.xsl Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to pdf; Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/p= df-common.xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/pdf-com= mon.xsl 2009-05-21 11:48:07 UTC (rev 14257) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/pdf-com= mon.xsl 2009-05-21 12:05:54 UTC (rev 14258) @@ -15,14 +15,98 @@ bold 12pt center - - - - = - - - - no-force - + + + = - + + + + no-force + + = + + = + + + + + + = + + + + + + + + = + + + + + = + + + + + + + + + + + + = + + + + = + + + + + + + = + + + + + + + = + + + + + + + = + + = + + + + + + = + + = + + + + + + --===============8030234258275406706==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 08:12:29 2009 Content-Type: multipart/mixed; boundary="===============8783210465487917902==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14259 - branches/community/3.3.X/docs/common-resources/en/src/main/css. Date: Thu, 21 May 2009 08:06:11 -0400 Message-ID: --===============8783210465487917902== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 08:06:10 -0400 (Thu, 21 May 2009) New Revision: 14259 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/css/html-comm= on.css Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to pdf; Modified: branches/community/3.3.X/docs/common-resources/en/src/main/css/ht= ml-common.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/css/html-com= mon.css 2009-05-21 12:05:54 UTC (rev 14258) +++ branches/community/3.3.X/docs/common-resources/en/src/main/css/html-com= mon.css 2009-05-21 12:06:10 UTC (rev 14259) @@ -27,7 +27,16 @@ h3.author{ margin: 0px; } - + +#title a.doc_href { + display:block; + height:89px; + background:transparent url(../images/rf_logo.png) top right no-repeat; +} +.corpauthor img{ + display:none !important; +} + div.book, div.chapter, div.section{ width:1000px; margin:0 auto; @@ -317,12 +326,7 @@ #feedback-link img{ width: 47px; height:315px; -} -#title a.doc_href { - display:block; - height:89px; - background:transparent url(../images/rf_logo.png) top right no-repeat; -} +} .remark{ font-size: 11px; margin-top: -15px; --===============8783210465487917902==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 08:13:40 2009 Content-Type: multipart/mixed; boundary="===============0241489115575393421==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14260 - branches/community/3.3.X/docs/userguide/en/src/main/docbook. Date: Thu, 21 May 2009 08:07:22 -0400 Message-ID: --===============0241489115575393421== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 08:07:22 -0400 (Thu, 21 May 2009) New Revision: 14260 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to pdf; Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/maste= r.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-21 12:06:10 UTC (rev 14259) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-21 12:07:22 UTC (rev 14260) @@ -65,6 +65,16 @@ RichFaces Developer Guide + + + + + = + + + = + = + RichFaces framework with a huge library of rich components and= skinnability support 2008, 2009 @@ -102,6 +112,7 @@ &richfaces_table; --> + = &coreComponents_table; &beanValidator_table; &calendar_table; @@ -153,8 +164,6 @@ &tree_table; &treeModel_table; = - - = &rfcidesupport; --===============0241489115575393421==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 08:36:07 2009 Content-Type: multipart/mixed; boundary="===============1322454591688672602==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14261 - branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum. Date: Thu, 21 May 2009 08:29:50 -0400 Message-ID: --===============1322454591688672602== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-21 08:29:50 -0400 (Thu, 21 May 2009) New Revision: 14261 Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ric= hfaces/photoalbum/RealWorldHelper.java branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ric= hfaces/photoalbum/SeleniumTestBase.java Log: RF-6909 Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/= org/richfaces/photoalbum/RealWorldHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/RealWorldHelper.java 2009-05-21 12:07:22 UTC (rev 14260) +++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/RealWorldHelper.java 2009-05-21 12:29:50 UTC (rev 14261) @@ -443,6 +443,12 @@ if (presented) { selenium.click(HtmlConstants.ImageArea.PREVIEW_PATH + "[" + i + "]" + = HtmlConstants.ImageArea.PREVIEW_LINK_PATH_SUFFIX); waitForAjaxCompletion(selenium); + try { + Thread.sleep(5000); // It was do for jboss 5.X + }catch (Exception e) { + Assert.fail("Test failed caused by: " + e); + } + = testImageArea(selenium, imageName); } = Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/= org/richfaces/photoalbum/SeleniumTestBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/SeleniumTestBase.java 2009-05-21 12:07:22 UTC (rev 14260) +++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/ri= chfaces/photoalbum/SeleniumTestBase.java 2009-05-21 12:29:50 UTC (rev 14261) @@ -108,6 +108,7 @@ selenium =3D createSeleniumClient(protocol + "://" + host + ":= " + port + "/", browser); setFileExtensionContent(); selenium.start(); + selenium.setTimeout("120000"); // It was do for jboss 5.X selenium.allowNativeXpath("false"); } } --===============1322454591688672602==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 09:08:45 2009 Content-Type: multipart/mixed; boundary="===============8592537289142807679==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14262 - branches/community/3.3.X/docs/userguide/en/src/main/resources/images. Date: Thu, 21 May 2009 09:02:28 -0400 Message-ID: --===============8592537289142807679== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:02:27 -0400 (Thu, 21 May 2009) New Revision: 14262 Added: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/ric= hfaces_logo.png Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo image; Added: branches/community/3.3.X/docs/userguide/en/src/main/resources/images= /richfaces_logo.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/community/3.3.X/docs/userguide/en/src/main/re= sources/images/richfaces_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============8592537289142807679==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 09:11:23 2009 Content-Type: multipart/mixed; boundary="===============4819913990970629423==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14263 - branches/community/3.3.X/docs/cdkguide/en/src/main/docbook. Date: Thu, 21 May 2009 09:04:57 -0400 Message-ID: --===============4819913990970629423== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:04:57 -0400 (Thu, 21 May 2009) New Revision: 14263 Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to PDF; Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml 2= 009-05-21 13:02:27 UTC (rev 14262) +++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml 2= 009-05-21 13:04:57 UTC (rev 14263) @@ -50,6 +50,16 @@ RichFaces CDK Developer Guide + + + + + = + + + = + = + Gleb Galkin --===============4819913990970629423==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 09:57:41 2009 Content-Type: multipart/mixed; boundary="===============2251781983506938583==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14264 - branches/community/3.3.X/docs/cdkguide/en/src/main/resources/images. Date: Thu, 21 May 2009 09:51:14 -0400 Message-ID: --===============2251781983506938583== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:51:14 -0400 (Thu, 21 May 2009) New Revision: 14264 Added: branches/community/3.3.X/docs/cdkguide/en/src/main/resources/images/rich= faces_logo.png Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo image; Added: branches/community/3.3.X/docs/cdkguide/en/src/main/resources/images/= richfaces_logo.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/community/3.3.X/docs/cdkguide/en/src/main/res= ources/images/richfaces_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============2251781983506938583==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 09:59:04 2009 Content-Type: multipart/mixed; boundary="===============5203478956825793075==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14265 - branches/community/3.3.X/docs/migrationguide/en/src/main/docbook. Date: Thu, 21 May 2009 09:52:45 -0400 Message-ID: --===============5203478956825793075== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:52:45 -0400 (Thu, 21 May 2009) New Revision: 14265 Modified: branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master.= xml Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to PNG; Modified: branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/= master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master= .xml 2009-05-21 13:51:14 UTC (rev 14264) +++ branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master= .xml 2009-05-21 13:52:45 UTC (rev 14265) @@ -22,7 +22,7 @@ - + = = @@ -31,6 +31,16 @@ RichFaces Migration Guide + + + + + = + + + = + = + Gleb Galkin @@ -147,7 +157,7 @@ = = &dataTableAjax; - + --===============5203478956825793075==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 10:00:13 2009 Content-Type: multipart/mixed; boundary="===============6976826818993942345==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14266 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images. Date: Thu, 21 May 2009 09:53:54 -0400 Message-ID: --===============6976826818993942345== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:53:54 -0400 (Thu, 21 May 2009) New Revision: 14266 Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resource= s/images/richfaces_logo.png Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo image; Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/reso= urces/images/richfaces_logo.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/community/3.3.X/docs/photo_album_app_guide/en= /src/main/resources/images/richfaces_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============6976826818993942345==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 10:00:40 2009 Content-Type: multipart/mixed; boundary="===============6423263621612343703==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14267 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook. Date: Thu, 21 May 2009 09:54:19 -0400 Message-ID: --===============6423263621612343703== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-21 09:54:19 -0400 (Thu, 21 May 2009) New Revision: 14267 Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/= master.xml Log: https://jira.jboss.org/jira/browse/RF-7014 - adding the RF logo to PDF; Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/d= ocbook/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook= /master.xml 2009-05-21 13:53:54 UTC (rev 14266) +++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook= /master.xml 2009-05-21 13:54:19 UTC (rev 14267) @@ -27,6 +27,16 @@ RichFaces Photo Album Application Guide + + + + + = + + + = + = + This documentation is work in progress, thus some mi= stakes or incompleteness is possible Alex --===============6423263621612343703==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 12:20:37 2009 Content-Type: multipart/mixed; boundary="===============5129994740386357237==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14268 - in branches/community/3.3.X: ui/colorPicker/src/main/config/component and 1 other directories. Date: Thu, 21 May 2009 12:14:18 -0400 Message-ID: --===============5129994740386357237== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-21 12:14:17 -0400 (Thu, 21 May 2009) New Revision: 14268 Modified: branches/community/3.3.X/samples/colorPickerDemo/src/main/webapp/pages/i= ndex.jsp branches/community/3.3.X/ui/colorPicker/src/main/config/component/colorP= icker.xml branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces= /htmlColorPicker.jspx Log: Colorpicker: add "inputSize" attribute https://jira.jboss.org/jira/browse/RF-7191 Modified: branches/community/3.3.X/samples/colorPickerDemo/src/main/webapp/= pages/index.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/colorPickerDemo/src/main/webapp/pages/= index.jsp 2009-05-21 13:54:19 UTC (rev 14267) +++ branches/community/3.3.X/samples/colorPickerDemo/src/main/webapp/pages/= index.jsp 2009-05-21 16:14:17 UTC (rev 14268) @@ -24,7 +24,7 @@ = - + = Modified: branches/community/3.3.X/ui/colorPicker/src/main/config/component= /colorPicker.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/colorPicker/src/main/config/component/color= Picker.xml 2009-05-21 13:54:19 UTC (rev 14267) +++ branches/community/3.3.X/ui/colorPicker/src/main/config/component/color= Picker.xml 2009-05-21 16:14:17 UTC (rev 14268) @@ -56,6 +56,13 @@ + + inputSize + java.lang.Integer + + inputSize - way to set the size of the edit box + + = &ui_component_attributes; &html_events; Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/ri= chfaces/htmlColorPicker.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-21 13:54:19 UTC (rev 14267) +++ branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-21 16:14:17 UTC (rev 14268) @@ -28,7 +28,7 @@ = - + = --===============5129994740386357237==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 12:39:10 2009 Content-Type: multipart/mixed; boundary="===============0230901565189604727==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14269 - branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces. Date: Thu, 21 May 2009 12:32:51 -0400 Message-ID: --===============0230901565189604727== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-21 12:32:51 -0400 (Thu, 21 May 2009) New Revision: 14269 Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces= /htmlColorPicker.jspx Log: ColorPicker does not output valid XHTML https://jira.jboss.org/jira/browse/RF-7088 Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/ri= chfaces/htmlColorPicker.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-21 16:14:17 UTC (rev 14268) +++ branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-21 16:32:51 UTC (rev 14269) @@ -36,7 +36,7 @@ - + 3D"icon"/ @@ -72,31 +72,31 @@
      - +
      - +
      - +
      - +
      - +
      - +
      =
      = - +
      --===============0230901565189604727==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 14:09:34 2009 Content-Type: multipart/mixed; boundary="===============3542228620158489809==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14270 - in branches/community/3.3.X/docs/userguide/en/src/main: resources/images and 1 other directory. Date: Thu, 21 May 2009 14:03:14 -0400 Message-ID: --===============3542228620158489809== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-21 14:03:13 -0400 (Thu, 21 May 2009) New Revision: 14270 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/col= orPicker.xml branches/community/3.3.X/docs/userguide/en/src/main/resources/images/col= orPicker_cn.png Log: https://jira.jboss.org/jira/browse/RF-6986 - all rich-colorpicker-* classe= s were renamed Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/inclu= ded/colorPicker.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/co= lorPicker.xml 2009-05-21 16:32:51 UTC (rev 14269) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/co= lorPicker.xml 2009-05-21 18:03:13 UTC (rev 14270) @@ -370,11 +370,11 @@
      - .rich-colorPicker-span input + .rich-colorpicker-span input Defines styles for the input field that contains select= ed color - .rich-colorPicker-icon + .rich-colorpicker-icon Defines styles for the icon @@ -391,23 +391,23 @@ - .rich-colorPicker-ext + .rich-colorpicker-ext Defines styles for the wrapper <div> element of a= widget - .rich-colorPicker-color + .rich-colorpicker-color Defines styles for the color palette - .rich-colorPicker-current-color + .rich-colorpicker-current-color Defines styles for the currently selected color - .rich-colorPicker-new-color + .rich-colorpicker-new-color Defines styles for the already selected color - .rich-colorPicker-colors-input + .rich-colorpicker-colors-input Defines styles for the hex, RGB, and HSB input fileds @@ -424,11 +424,11 @@ - .rich-colorPicker-submit + .rich-colorpicker-submit Defines styles for the "Apply" button - .rich-colorPicker-cancel + .rich-colorpicker-cancel Defines styles for the "Cancel" button Modified: branches/community/3.3.X/docs/userguide/en/src/main/resources/ima= ges/colorPicker_cn.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============3542228620158489809==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 14:16:53 2009 Content-Type: multipart/mixed; boundary="===============0060708908572510766==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14271 - branches/community/3.3.X/framework/impl/src/main/javascript/ajaxjsf. Date: Thu, 21 May 2009 14:10:32 -0400 Message-ID: --===============0060708908572510766== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-21 14:10:32 -0400 (Thu, 21 May 2009) New Revision: 14271 Modified: branches/community/3.3.X/framework/impl/src/main/javascript/ajaxjsf/JSFA= JAX.js Log: https://jira.jboss.org/jira/browse/RF-5313 https://jira.jboss.org/jira/browse/RF-7227 Modified: branches/community/3.3.X/framework/impl/src/main/javascript/ajaxj= sf/JSFAJAX.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/framework/impl/src/main/javascript/ajaxjsf/JSF= AJAX.js 2009-05-21 18:03:13 UTC (rev 14270) +++ branches/community/3.3.X/framework/impl/src/main/javascript/ajaxjsf/JSF= AJAX.js 2009-05-21 18:10:32 UTC (rev 14271) @@ -1193,6 +1193,8 @@ LOG.debug("Input in response: "+newinput.getAttribute("name= ")); for(var j =3D 0 ; j < inputs.length; j++){ var input =3D inputs[j]; + input.setAttribute("autocomplete", "off"); + = if(input.name =3D=3D newinput.getAttribute("name")){ LOG.debug("Found same input on page with type: "+input.typ= e); input.value =3D newinput.getAttribute("value"); --===============0060708908572510766==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 14:39:26 2009 Content-Type: multipart/mixed; boundary="===============1914082039159462564==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14272 - branches/community/3.3.X/ui/tabPanel/src/main/templates. Date: Thu, 21 May 2009 14:33:06 -0400 Message-ID: --===============1914082039159462564== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-21 14:33:06 -0400 (Thu, 21 May 2009) New Revision: 14272 Modified: branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx Log: https://jira.jboss.org/jira/browse/RF-4568 Modified: branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx 2009-0= 5-21 18:10:32 UTC (rev 14271) +++ branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx 2009-0= 5-21 18:33:06 UTC (rev 14272) @@ -19,7 +19,7 @@
      = + - + + +
      +
      -
      +
      - +
      @@ -57,18 +60,20 @@
      		- +
      + - - +
      +
      		+
      		@@ -80,13 +85,14 @@
      -
      +
      =
      =
      --===============1914082039159462564==-- From richfaces-svn-commits at lists.jboss.org Thu May 21 20:35:17 2009 Content-Type: multipart/mixed; boundary="===============2412304780333701368==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14273 - in branches/community/3.3.X: samples/beanValidatorSample/src/main/java/org/richfaces and 17 other directories. Date: Thu, 21 May 2009 20:28:52 -0400 Message-ID: --===============2412304780333701368== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-21 20:28:52 -0400 (Thu, 21 May 2009) New Revision: 14273 Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/Bean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/DataBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/GraphValidatorBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/LengthBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/MaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/MinBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/MinMaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/NotEmptyBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/jsr= 299src/org/richfaces/example/NotNullBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/DataBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/LengthBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/MaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/MinBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/MinMaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/NotEmptyBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/src= /org/richfaces/example/NotNullBean.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/UIAjaxValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/re= nderkit/html/AjaxValidatorRenderer.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/ta= glib/GraphValidatorHandler.java Removed: branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/DataBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/LengthBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/MaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/MinBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/MinMaxBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/NotEmptyBean.java branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/r= ichfaces/NotNullBean.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/UIBeanValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/re= nderkit/html/BeanValidatorRenderer.java Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/WEB= -INF/faces-config.xml branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pag= es/ajaxValidation.xhtml branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pag= es/beanValidation.xhtml branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pag= es/graphValidation.xhtml branches/community/3.3.X/ui/assembly/styles.txt branches/community/3.3.X/ui/beanValidator/pom.xml branches/community/3.3.X/ui/beanValidator/src/main/config/component/bean= Validator.xml branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/UIGraphValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/ta= glib/AjaxValidatorHandler.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/ta= glib/AjaxValidatorTagBase.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/ta= glib/BeanValidatorHandler.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/ta= glib/BeanValidatorTag.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/va= lidator/BeanValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/va= lidator/FacesBeanValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/va= lidator/GraphValidator.java branches/community/3.3.X/ui/beanValidator/src/main/templates/org/richfac= es/ui/htmlBeanValidator.jspx branches/community/3.3.X/ui/beanValidator/src/test/java/org/richfaces/co= mponent/BeanValidatorComponentTest.java Log: Fix Jsr-299 compatibility Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-05-21= 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-05-22= 00:28:52 UTC (rev 14273) @@ -1,5 +1,6 @@ - + samples org.richfaces @@ -21,25 +22,6 @@ 1.5 - - org.codehaus.mojo - build-helper-maven-plugin - - - - add-source - generate-sources - - add-source - - - - src/main/webapp/src - - - - - @@ -55,19 +37,6 @@ 3.3.2-SNAPSHOT --> - org.hibernate - hibernate-validator - 3.1.0.GA - - - - - org.slf4j slf4j-jcl 1.4.2 @@ -83,4 +52,88 @@ 1.0 + + + hibernate + + true + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + add-source + generate-sources + + add-source + + + + src/main/webapp/src + + + + + + + + + + org.hibernate + hibernate-validator + 3.1.0.GA + + + + + + + + jsr299 + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + add-source + generate-sources + + add-source + + + + src/main/webapp/jsr299src + + + + + + + + + + javax.validation + validation-api + 1.0.CR2 + + + org.hibernate + hibernate-validator + 4.0.0.Beta1 + + + + \ No newline at end of file Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/DataBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/DataBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/DataBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,52 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import java.util.ArrayList; -import java.util.List; - -import org.ajax4jsf.event.AjaxEvent; -import org.hibernate.validator.Max; -import org.hibernate.validator.Valid; - -/** - * @author asmirnov - * - */ -public class DataBean { - = - private final List beans; - = - /** - * @return the beans - */ - @Valid - public List getBeans() { - return beans; - } - - public DataBean() { - beans =3D new ArrayList(6); - beans.add(new NotNullBean()); - beans.add(new NotEmptyBean()); - beans.add(new LengthBean()); - beans.add(new MinBean()); - beans.add(new MaxBean()); - beans.add(new MinMaxBean()); - } - - @Max(value=3D20,message=3D"Total value should be less then 20") - public int getTotal(){ - int total =3D 0; - for (Validable bean : beans) { - total +=3D bean.getIntValue(); - } - return total; - } - - public void ajaxListener(AjaxEvent ajaxEvent) { - System.out.println("DataBean.ajaxListener()"); - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/LengthBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/LengthBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/LengthBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,65 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.Length; -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class LengthBean implements Validable { - = - @Length(max=3D10,min=3D2,message=3D"incorrect field length") - private String text; - = - private int intValue; - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Validate String Length, for a range 2-10 chars"; - } - - public String getIntDescription() { - return "Integer Value, no restrictions"; - } - - public String getIntSummary() { - return "Invalid user name"; - } - - public String getTextSummary() { - return "Invalid user name"; - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/MaxBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MaxBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MaxBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,72 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.CreditCardNumber; -import org.hibernate.validator.Length; -import org.hibernate.validator.Max; -import org.hibernate.validator.Min; -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class MaxBean implements Validable { - = - private String text; - = - @Max(10) - private int intValue; - - /** - * @return the text - */ - @CreditCardNumber - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Text value, should be correct credit card number"; - } - - public String getIntDescription() { - // TODO Auto-generated method stub - return "Integer Value, less then 10"; - } - - public String getIntSummary() { - // TODO Auto-generated method stub - return "Invalid number of items"; - } - - public String getTextSummary() { - // TODO Auto-generated method stub - return "Invalid payment card"; - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/MinBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MinBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MinBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,69 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.Length; -import org.hibernate.validator.Min; -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class MinBean implements Validable { - = - private String text; - = - @Min(2) - private int intValue; - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Text value, no restrictions"; - } - - public String getIntDescription() { - // TODO Auto-generated method stub - return "Integer Value, more then 1"; - } - - public String getIntSummary() { - // TODO Auto-generated method stub - return "Invalid rooms qty"; - } - - public String getTextSummary() { - // TODO Auto-generated method stub - return null; - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/MinMaxBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MinMaxBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/MinMaxBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,71 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.Length; -import org.hibernate.validator.Max; -import org.hibernate.validator.Min; -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class MinMaxBean implements Validable { - = - private String text; - = - @Min(2) - @Max(10) - private int intValue; - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Text Value, no restrictions"; - } - - public String getIntDescription() { - // TODO Auto-generated method stub - return "Integer Value, valid values from 2 to 10"; - } - - public String getIntSummary() { - // TODO Auto-generated method stub - return "Invalid price"; - } - - public String getTextSummary() { - // TODO Auto-generated method stub - return null; - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/NotEmptyBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/NotEmptyBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/NotEmptyBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,67 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.NotEmpty; -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class NotEmptyBean implements Validable { - = - @NotEmpty - private String text; - = - private int intValue; - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Text value, Not Empty Validation"; - } - - public String getIntDescription() { - // TODO Auto-generated method stub - return "Integer Value, no restrictions"; - } - - public String getIntSummary() { - // TODO Auto-generated method stub - return null; - } - - public String getTextSummary() { - // TODO Auto-generated method stub - return "Invalid password"; - } - -} Deleted: branches/community/3.3.X/samples/beanValidatorSample/src/main/java= /org/richfaces/NotNullBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/NotNullBean.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/java/org/= richfaces/NotNullBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,66 +0,0 @@ -/** - * = - */ -package org.richfaces; - -import org.hibernate.validator.NotNull; - -/** - * @author asmirnov - * - */ -public class NotNullBean implements Validable { - = - @NotNull - private String text; - = - private int intValue; - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text the text to set - */ - public void setText(String text) { - this.text =3D text; - } - - /** - * @return the intValue - */ - public int getIntValue() { - return intValue; - } - - /** - * @param intValue the intValue to set - */ - public void setIntValue(int intValue) { - this.intValue =3D intValue; - } - - public String getTextDescription() { - return "Text Value, Not Null Validation"; - } - - public String getIntDescription() { - // TODO Auto-generated method stub - return "Integer Value, no restrictions"; - } - - public String getIntSummary() { - // TODO Auto-generated method stub - return null; - } - - public String getTextSummary() { - // TODO Auto-generated method stub - return "Invalid address"; - } - -} Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/web= app/WEB-INF/faces-config.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/WE= B-INF/faces-config.xml 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/WE= B-INF/faces-config.xml 2009-05-22 00:28:52 UTC (rev 14273) @@ -9,17 +9,17 @@ data - org.richfaces.DataBean + org.richfaces.example.DataBean session lengthBean - org.richfaces.LengthBean + org.richfaces.example.LengthBean session minMaxBean - org.richfaces.MinMaxBean + org.richfaces.example.MinMaxBean session Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /jsr299src/org/richfaces/example/Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/Bean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/Bean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,73 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.richfaces.example; + +import javax.validation.constraints.Pattern; + +import org.hibernate.validation.constraints.NotEmpty; + + +/** + * JSF bean with text property validation. + */ +public class Bean { + = + /** + * Text property + */ + private String email; + = + private String creditCardNumber; + + /** + * @return the creditCardNumber + */ + @Pattern(regexp=3D"\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\= \\\d\\\\d\\\\d\\\\d\\\\d") + public String getCreditCardNumber() { + return creditCardNumber; + } + + /** + * @param creditCardNumber the creditCardNumber to set + */ + public void setCreditCardNumber(String creditCardNumber) { + this.creditCardNumber =3D creditCardNumber; + } + + /** + * @return the text + */ + @NotEmpty +// @Email + @Pattern(regexp=3D"^[a-zA-Z][\\w\\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\\w\\.-]*[a= -zA-Z0-9]\\.[a-zA-Z][a-zA-Z\\.]*[a-zA-Z]$") + public String getEmail() { + return email; + } + + /** + * @param text the text to set + */ + public void setEmail(String text) { + this.email =3D text; + } + = +} \ No newline at end of file Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/Bean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/DataBean.java (from rev 14267, branches/c= ommunity/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/Data= Bean.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/DataBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/DataBean.java 2009-05-22 00:28:52 UTC (rev 14= 273) @@ -0,0 +1,54 @@ +/** + * = + */ +package org.richfaces.example; + +import java.util.ArrayList; +import java.util.List; + +import javax.validation.Valid; +import javax.validation.constraints.Max; + +import org.ajax4jsf.event.AjaxEvent; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class DataBean { + = + private final List beans; + = + /** + * @return the beans + */ + @Valid + public List getBeans() { + return beans; + } + + public DataBean() { + beans =3D new ArrayList(6); + beans.add(new NotNullBean()); + beans.add(new NotEmptyBean()); + beans.add(new LengthBean()); + beans.add(new MinBean()); + beans.add(new MaxBean()); + beans.add(new MinMaxBean()); + } + + @Max(value=3D20,message=3D"Total value should be less then 20") + public int getTotal(){ + int total =3D 0; + for (Validable bean : beans) { + total +=3D bean.getIntValue(); + } + return total; + } + + public void ajaxListener(AjaxEvent ajaxEvent) { + System.out.println("DataBean.ajaxListener()"); + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/DataBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /jsr299src/org/richfaces/example/GraphValidatorBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/GraphValidatorBean.java = (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/GraphValidatorBean.java 2009-05-22 00:28:52 U= TC (rev 14273) @@ -0,0 +1,98 @@ +/** + * = + */ +package org.richfaces.example; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + + +/** + * @author asmirnov + * + */ +public class GraphValidatorBean { + + @Min(0) + @Max(10) + private int first ; + + @Min(0) + @Max(10) + private int second ; + @Min(0) + @Max(10) + private int third ; + + private String actionResult; + = + /** + * @return the actionResult + */ + public String getActionResult() { + return actionResult; + } + + /** + * @param actionResult the actionResult to set + */ + public void setActionResult(String actionResult) { + this.actionResult =3D actionResult; + } + + /** + * @return the first + */ + public int getFirst() { + return first; + } + + /** + * @param first the first to set + */ + public void setFirst(int first) { + this.first =3D first; + } + + /** + * @return the second + */ + public int getSecond() { + return second; + } + + /** + * @param second the second to set + */ + public void setSecond(int second) { + this.second =3D second; + } + + /** + * @return the third + */ + public int getThird() { + return third; + } + + /** + * @param third the third to set + */ + public void setThird(int third) { + this.third =3D third; + } + + /** + * @return total summ of the list values. + */ + @Max(value=3D20,message=3D"Total value should be less then 20") + public int getSumm(){ + return first+second+third; + } + = + public String action() { + // Persist your data here + setActionResult("Data have been saved"); + return "ok"; + } +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/GraphValidatorBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/LengthBean.java (from rev 14267, branches= /community/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/Le= ngthBean.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/LengthBean.java (rev = 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/LengthBean.java 2009-05-22 00:28:52 UTC (rev = 14273) @@ -0,0 +1,64 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validation.constraints.Length; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class LengthBean implements Validable { + = + @Length(max=3D10,min=3D2,message=3D"incorrect field length") + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Validate String Length, for a range 2-10 chars"; + } + + public String getIntDescription() { + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + return "Invalid user name"; + } + + public String getTextSummary() { + return "Invalid user name"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/LengthBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/MaxBean.java (from rev 14267, branches/co= mmunity/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBe= an.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MaxBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MaxBean.java 2009-05-22 00:28:52 UTC (rev 142= 73) @@ -0,0 +1,71 @@ +/** + * = + */ +package org.richfaces.example; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Pattern; + +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MaxBean implements Validable { + = + private String text; + = + @Max(10) + private int intValue; + + /** + * @return the text + */ +// @CreditCardNumber + @Pattern(regexp=3D"\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\\\\d\= \\\d\\\\d\\\\d\\\\d\\\\d") + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, should be correct credit card number"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, less then 10"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid number of items"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid payment card"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/MaxBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/MinBean.java (from rev 14267, branches/co= mmunity/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/MinBe= an.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MinBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MinBean.java 2009-05-22 00:28:52 UTC (rev 142= 73) @@ -0,0 +1,68 @@ +/** + * = + */ +package org.richfaces.example; + +import javax.validation.constraints.Min; + +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MinBean implements Validable { + = + private String text; + = + @Min(2) + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, no restrictions"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, more then 1"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid rooms qty"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/MinBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/MinMaxBean.java (from rev 14267, branches= /community/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/Mi= nMaxBean.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MinMaxBean.java (rev = 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/MinMaxBean.java 2009-05-22 00:28:52 UTC (rev = 14273) @@ -0,0 +1,70 @@ +/** + * = + */ +package org.richfaces.example; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MinMaxBean implements Validable { + = + private String text; + = + @Min(2) + @Max(10) + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text Value, no restrictions"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, valid values from 2 to 10"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid price"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/MinMaxBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/NotEmptyBean.java (from rev 14267, branch= es/community/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/= NotEmptyBean.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/NotEmptyBean.java (re= v 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/NotEmptyBean.java 2009-05-22 00:28:52 UTC (re= v 14273) @@ -0,0 +1,67 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validation.constraints.NotEmpty; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class NotEmptyBean implements Validable { + = + @NotEmpty + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, Not Empty Validation"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return null; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid password"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/NotEmptyBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/community/3.3.X/samples/beanValidatorSample/src/main/webap= p/jsr299src/org/richfaces/example/NotNullBean.java (from rev 14267, branche= s/community/3.3.X/samples/beanValidatorSample/src/main/java/org/richfaces/N= otNullBean.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/NotNullBean.java (rev= 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/js= r299src/org/richfaces/example/NotNullBean.java 2009-05-22 00:28:52 UTC (rev= 14273) @@ -0,0 +1,68 @@ +/** + * = + */ +package org.richfaces.example; + +import javax.validation.constraints.NotNull; + +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class NotNullBean implements Validable { + = + @NotNull + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text Value, Not Null Validation"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return null; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid address"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/jsr299src/org/richfaces/example/NotNullBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/web= app/pages/ajaxValidation.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/ajaxValidation.xhtml 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/ajaxValidation.xhtml 2009-05-22 00:28:52 UTC (rev 14273) @@ -20,12 +20,12 @@ - - + Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/web= app/pages/beanValidation.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/beanValidation.xhtml 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/beanValidation.xhtml 2009-05-22 00:28:52 UTC (rev 14273) @@ -20,12 +20,12 @@ - + - + Modified: branches/community/3.3.X/samples/beanValidatorSample/src/main/web= app/pages/graphValidation.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/graphValidation.xhtml 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/pa= ges/graphValidation.xhtml 2009-05-22 00:28:52 UTC (rev 14273) @@ -17,7 +17,7 @@ - = + = Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/DataBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/DataBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/DataBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,53 @@ +/** + * = + */ +package org.richfaces.example; + +import java.util.ArrayList; +import java.util.List; + +import org.ajax4jsf.event.AjaxEvent; +import org.hibernate.validator.Max; +import org.hibernate.validator.Valid; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class DataBean { + = + private final List beans; + = + /** + * @return the beans + */ + @Valid + public List getBeans() { + return beans; + } + + public DataBean() { + beans =3D new ArrayList(6); + beans.add(new NotNullBean()); + beans.add(new NotEmptyBean()); + beans.add(new LengthBean()); + beans.add(new MinBean()); + beans.add(new MaxBean()); + beans.add(new MinMaxBean()); + } + + @Max(value=3D20,message=3D"Total value should be less then 20") + public int getTotal(){ + int total =3D 0; + for (Validable bean : beans) { + total +=3D bean.getIntValue(); + } + return total; + } + + public void ajaxListener(AjaxEvent ajaxEvent) { + System.out.println("DataBean.ajaxListener()"); + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/DataBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/LengthBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/LengthBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/LengthBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,66 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.Length; +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class LengthBean implements Validable { + = + @Length(max=3D10,min=3D2,message=3D"incorrect field length") + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Validate String Length, for a range 2-10 chars"; + } + + public String getIntDescription() { + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + return "Invalid user name"; + } + + public String getTextSummary() { + return "Invalid user name"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/LengthBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/MaxBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MaxBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MaxBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,73 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.CreditCardNumber; +import org.hibernate.validator.Length; +import org.hibernate.validator.Max; +import org.hibernate.validator.Min; +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MaxBean implements Validable { + = + private String text; + = + @Max(10) + private int intValue; + + /** + * @return the text + */ + @CreditCardNumber + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, should be correct credit card number"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, less then 10"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid number of items"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid payment card"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/MaxBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/MinBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MinBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MinBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,70 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.Length; +import org.hibernate.validator.Min; +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MinBean implements Validable { + = + private String text; + = + @Min(2) + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, no restrictions"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, more then 1"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid rooms qty"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/MinBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/MinMaxBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MinMaxBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/MinMaxBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,72 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.Length; +import org.hibernate.validator.Max; +import org.hibernate.validator.Min; +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class MinMaxBean implements Validable { + = + private String text; + = + @Min(2) + @Max(10) + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text Value, no restrictions"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, valid values from 2 to 10"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return "Invalid price"; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/MinMaxBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/NotEmptyBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/NotEmptyBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/NotEmptyBean.java 2009-05-22 00:28:52 UTC (rev 1427= 3) @@ -0,0 +1,68 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.NotEmpty; +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class NotEmptyBean implements Validable { + = + @NotEmpty + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text value, Not Empty Validation"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return null; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid password"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/NotEmptyBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp= /src/org/richfaces/example/NotNullBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/NotNullBean.java (rev 0) +++ branches/community/3.3.X/samples/beanValidatorSample/src/main/webapp/sr= c/org/richfaces/example/NotNullBean.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,67 @@ +/** + * = + */ +package org.richfaces.example; + +import org.hibernate.validator.NotNull; +import org.richfaces.Validable; + +/** + * @author asmirnov + * + */ +public class NotNullBean implements Validable { + = + @NotNull + private String text; + = + private int intValue; + + /** + * @return the text + */ + public String getText() { + return text; + } + + /** + * @param text the text to set + */ + public void setText(String text) { + this.text =3D text; + } + + /** + * @return the intValue + */ + public int getIntValue() { + return intValue; + } + + /** + * @param intValue the intValue to set + */ + public void setIntValue(int intValue) { + this.intValue =3D intValue; + } + + public String getTextDescription() { + return "Text Value, Not Null Validation"; + } + + public String getIntDescription() { + // TODO Auto-generated method stub + return "Integer Value, no restrictions"; + } + + public String getIntSummary() { + // TODO Auto-generated method stub + return null; + } + + public String getTextSummary() { + // TODO Auto-generated method stub + return "Invalid address"; + } + +} Property changes on: branches/community/3.3.X/samples/beanValidatorSample/s= rc/main/webapp/src/org/richfaces/example/NotNullBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/community/3.3.X/ui/assembly/styles.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/assembly/styles.txt 2009-05-21 18:33:06 UTC= (rev 14272) +++ branches/community/3.3.X/ui/assembly/styles.txt 2009-05-22 00:28:52 UTC= (rev 14273) @@ -21,3 +21,4 @@ ./org/richfaces/renderkit/html/css/panelMenu.xcss ./org/richfaces/renderkit/html/css/suggestionbox.xcss ./org/richfaces/renderkit/html/css/dataFilterSlider.xcss +./org/richfaces/renderkit/html/css/page.xcss Modified: branches/community/3.3.X/ui/beanValidator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/pom.xml 2009-05-21 18:33:06 U= TC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/pom.xml 2009-05-22 00:28:52 U= TC (rev 14273) @@ -1,5 +1,6 @@ - + ui org.richfaces Modified: branches/community/3.3.X/ui/beanValidator/src/main/config/compone= nt/beanValidator.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/config/component/bea= nValidator.xml 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/config/component/bea= nValidator.xml 2009-05-22 00:28:52 UTC (rev 14273) @@ -5,16 +5,16 @@ = - org.richfaces.BeanValidator - org.richfaces.BeanValidator + org.richfaces.AjaxValidator + org.richfaces.AjaxValidator - org.richfaces.component.html.HtmlBeanValidator + org.richfaces.component.html.HtmlAjaxValidator - org.richfaces.component.UIBeanValidator + org.richfaces.component.UIAjaxValidator is a component designed t= o provide ajax validation inside for JSF inputs.]]> - org.richfaces.BeanValidatorRenderer - org.richfaces.renderkit.html.BeanValidatorRenderer + org.richfaces.AjaxValidatorRenderer + org.richfaces.renderkit.html.AjaxValidatorRenderer ajaxValidator @@ -44,6 +44,13 @@ Summary message for a validation errors. + + profiles + java.lang.Object + + This attribute defines JavaBean Validation 'groups' feature (JSR-303).= It is ignored if Hibernate Validator is used. + + onsubmit java.lang.String @@ -134,6 +141,9 @@ icon + + org.richfaces.taglib.GraphValidatorHandler + &ui_component_attributes; = = = - profile - = + profiles + java.lang.Object - This attribute is reserved till the implementation of JavaBean Validat= ion feature (JSR-303). + This attribute defines JavaBean Validation 'groups' feature (JSR-303).= It is ignored if Hibernate Validator is used. = @@ -207,6 +217,13 @@ + profiles + java.lang.Object + + This attribute defines JavaBean Validation 'groups' feature (JSR-303).= It is ignored if Hibernate Validator is used. + + + binding org.richfaces.validator.FacesBeanValidator = Copied: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfac= es/component/UIAjaxValidator.java (from rev 14267, branches/community/3.3.X= /ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.jav= a) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIAjaxValidator.java (rev 0) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIAjaxValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,290 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.richfaces.component; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import javax.faces.FacesException; +import javax.faces.component.EditableValueHolder; +import javax.faces.component.NamingContainer; +import javax.faces.component.UIComponent; +import javax.faces.component.UIComponentBase; +import javax.faces.component.UIInput; +import javax.faces.component.UIMessage; +import javax.faces.component.UIMessages; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.PhaseId; + +import org.ajax4jsf.component.AjaxComponent; +import org.ajax4jsf.component.AjaxContainer; +import org.ajax4jsf.component.AjaxSupport; +import org.ajax4jsf.component.EventValueExpression; +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.event.AjaxEvent; +import org.ajax4jsf.event.AjaxListener; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.webapp.taglib.MethodExpressionAjaxListener; +import org.richfaces.event.ValidationEvent; + +/** + * JSF component class + * = + */ +public abstract class UIAjaxValidator extends UIComponentBase implements + AjaxComponent, AjaxSupport, AjaxContainer { + + public static final String COMPONENT_TYPE =3D "org.richfaces.AjaxValidato= r"; + + public static final String COMPONENT_FAMILY =3D "org.richfaces.AjaxValida= tor"; + + public static final String BEAN_VALIDATOR_FACET =3D "org.richfaces.valida= tor."; + + @Override + public void setParent(UIComponent parent) { + super.setParent(parent); + + if (null !=3D parent && parent instanceof EditableValueHolder) { + setParentProperties(parent); + } + } + + /** + * @param parent + * @throws FacesException + */ + public void setParentProperties(UIComponent parent) throws FacesException= { + if (!(parent instanceof EditableValueHolder)) { + throw new FacesException( + "Parent component must be an EditableValueHolder"); + } + + if (null !=3D getEvent()) { + ValueExpression binding =3D new EventValueExpression(this); + parent.setValueExpression(getEvent(), binding); + } + } + + @Override + public void broadcast(FacesEvent event) throws AbortProcessingException { + super.broadcast(event); + if (event.getComponent() =3D=3D this) { + FacesContext context =3D getFacesContext(); + if (event instanceof ValidationEvent) { + // ByPass UpdateModelValue + context.renderResponse(); + } else if (event instanceof AjaxEvent) { + // TODO - find all UIMessages components for a parent UIInput. + // for an ajaxSingle component, re-render only target message. + AjaxContext ajaxContext =3D AjaxContext + .getCurrentInstance(context); + ajaxContext.setSubmittedRegionClientId(this + .getClientId(context)); + } + } + } + + @Override + public void queueEvent(FacesEvent event) { + if (event instanceof ValidationEvent && event.getComponent() =3D=3D this= ) { + UIComponent parent =3D getParent(); + if (parent instanceof UIInput) { + UIInput input =3D (UIInput) parent; + if (input.isImmediate()) { + event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); + } else { + event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); + } + } + } + super.queueEvent(event); + } + + public String getEventString() { + StringBuffer buildOnEvent =3D new StringBuffer(); + String onsubmit =3D getOnsubmit(); + // Insert script to call before submit ajax request. + if (null !=3D onsubmit) { + buildOnEvent.append(onsubmit).append(";"); + } + buildOnEvent.append(AjaxRendererUtils.buildOnEvent(this, + getFacesContext(), getEvent())); + String script =3D buildOnEvent.toString(); + return script; + } + + public UIComponent getSingleComponent() { + return getParent(); + } + + public void encodeAjax(FacesContext context) throws IOException { + AjaxContext ajaxContext =3D AjaxContext.getCurrentInstance(context); + Set renderedAreas =3D ajaxContext.getAjaxRenderedAreas(); + for (UIComponent message : getMessages(context)) { + if (message.isRendered()) { + message.encodeAll(context); + renderedAreas.add(message.getClientId(context)); + } + } + // Write information about encoded areas after submission. + AjaxRendererUtils.encodeAreas(context, this); + } + + public Set getMessages(FacesContext context) { + Set messages =3D new HashSet(); + findMessages(this.getParent(), this, messages,false); + findRichMessages(context, context.getViewRoot(), messages); + return messages; + } + + = + /** + * Find all instances of the {@link UIRichMessages} and update list of th= e rendered messages. + * @param context + * @param component + * @param messages + */ + protected void findRichMessages(FacesContext context,UIComponent componen= t, Set messages) { + Iterator facetsAndChildren =3D component.getFacetsAndChildr= en(); + while (facetsAndChildren.hasNext()) { + UIComponent child =3D (UIComponent) facetsAndChildren.next(); + if (child instanceof UIRichMessages) { + UIRichMessages richMessage =3D (UIRichMessages) child; + if(null =3D=3D richMessage.getFor()){ + richMessage.updateMessages(context, this.getParent().getClientId(cont= ext)); + messages.add(richMessage); + } + } else { + findRichMessages(context, child, messages); + } + } + } + + /** + * Recursive search messages for the parent component. + * @param parent = + * @param component + * @param messages + * @return + */ + protected boolean findMessages(UIComponent parent, UIComponent component, + Set messages,boolean found) { + Iterator facetsAndChildren =3D parent.getFacetsAndChildren(= ); + while (facetsAndChildren.hasNext()) { + UIComponent child =3D (UIComponent) facetsAndChildren.next(); + if (child !=3D component) { + if (child instanceof UIMessage || child instanceof UIMessages) { + UIComponent message =3D (UIComponent) child; + Object targetId =3D message.getAttributes().get("for"); + if (null !=3D targetId + && targetId.equals(getParent().getId())) { + messages.add(message); + found =3D true; + } + } else { + found |=3D findMessages(child, null, messages,found); + } + } + } + if(!(found && parent instanceof NamingContainer) && component !=3D null){ + UIComponent newParent =3D parent.getParent(); + if(null !=3D newParent){ + found =3D findMessages(newParent, parent, messages,found); + } + } + return found; + } + + /* + * (non-Javadoc) + * = + * @see + * org.ajax4jsf.event.AjaxSource#addAjaxListener(org.ajax4jsf.event.AjaxL= istener + * ) + */ + public void addAjaxListener(AjaxListener listener) { + addFacesListener(listener); + } + + /* + * (non-Javadoc) + * = + * @see org.ajax4jsf.event.AjaxSource#getAjaxListeners() + */ + public AjaxListener[] getAjaxListeners() { + return (AjaxListener[]) getFacesListeners(AjaxListener.class); + } + + /* + * (non-Javadoc) + * = + * @seeorg.ajax4jsf.event.AjaxSource#removeAjaxListener(org.ajax4jsf.even= t. + * AjaxListener) + */ + public void removeAjaxListener(AjaxListener listener) { + removeFacesListener(listener); + } + + public void setAjaxListener(MethodExpression listener) { + AjaxListener[] ajaxListeners =3D getAjaxListeners(); + for (int i =3D 0; i < ajaxListeners.length; i++) { + AjaxListener ajaxListener =3D ajaxListeners[i]; + if (ajaxListener.getClass().equals( + MethodExpressionAjaxListener.class)) { + MethodExpressionAjaxListener expressionListener =3D (MethodExpressionA= jaxListener) ajaxListener; + if (expressionListener.getExpression() !=3D listener) { + removeAjaxListener(ajaxListener); + + if (listener =3D=3D null) { + + return; + } else { + + break; + } + } + } + } + + addAjaxListener(new MethodExpressionAjaxListener(listener)); + } + + public MethodExpression getAjaxListener() { + AjaxListener[] ajaxListeners =3D getAjaxListeners(); + for (int i =3D 0; i < ajaxListeners.length; i++) { + AjaxListener ajaxListener =3D ajaxListeners[i]; + if (ajaxListener.getClass().equals( + MethodExpressionAjaxListener.class)) { + MethodExpressionAjaxListener expressionListener =3D (MethodExpressionA= jaxListener) ajaxListener; + return expressionListener.getExpression(); + } + } + + return null; + } +} Property changes on: branches/community/3.3.X/ui/beanValidator/src/main/jav= a/org/richfaces/component/UIAjaxValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfa= ces/component/UIBeanValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIBeanValidator.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIBeanValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,290 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ - -package org.richfaces.component; - -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.faces.FacesException; -import javax.faces.component.EditableValueHolder; -import javax.faces.component.NamingContainer; -import javax.faces.component.UIComponent; -import javax.faces.component.UIComponentBase; -import javax.faces.component.UIInput; -import javax.faces.component.UIMessage; -import javax.faces.component.UIMessages; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; - -import org.ajax4jsf.component.AjaxComponent; -import org.ajax4jsf.component.AjaxContainer; -import org.ajax4jsf.component.AjaxSupport; -import org.ajax4jsf.component.EventValueExpression; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.AjaxListener; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.webapp.taglib.MethodExpressionAjaxListener; -import org.richfaces.event.ValidationEvent; - -/** - * JSF component class - * = - */ -public abstract class UIBeanValidator extends UIComponentBase implements - AjaxComponent, AjaxSupport, AjaxContainer { - - public static final String COMPONENT_TYPE =3D "org.richfaces.BeanValidato= r"; - - public static final String COMPONENT_FAMILY =3D "org.richfaces.BeanValida= tor"; - - public static final String BEAN_VALIDATOR_FACET =3D "org.richfaces.valida= tor."; - - @Override - public void setParent(UIComponent parent) { - super.setParent(parent); - - if (null !=3D parent && parent instanceof EditableValueHolder) { - setParentProperties(parent); - } - } - - /** - * @param parent - * @throws FacesException - */ - public void setParentProperties(UIComponent parent) throws FacesException= { - if (!(parent instanceof EditableValueHolder)) { - throw new FacesException( - "Parent component must be an EditableValueHolder"); - } - - if (null !=3D getEvent()) { - ValueExpression binding =3D new EventValueExpression(this); - parent.setValueExpression(getEvent(), binding); - } - } - - @Override - public void broadcast(FacesEvent event) throws AbortProcessingException { - super.broadcast(event); - if (event.getComponent() =3D=3D this) { - FacesContext context =3D getFacesContext(); - if (event instanceof ValidationEvent) { - // ByPass UpdateModelValue - context.renderResponse(); - } else if (event instanceof AjaxEvent) { - // TODO - find all UIMessages components for a parent UIInput. - // for an ajaxSingle component, re-render only target message. - AjaxContext ajaxContext =3D AjaxContext - .getCurrentInstance(context); - ajaxContext.setSubmittedRegionClientId(this - .getClientId(context)); - } - } - } - - @Override - public void queueEvent(FacesEvent event) { - if (event instanceof ValidationEvent && event.getComponent() =3D=3D this= ) { - UIComponent parent =3D getParent(); - if (parent instanceof UIInput) { - UIInput input =3D (UIInput) parent; - if (input.isImmediate()) { - event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); - } else { - event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); - } - } - } - super.queueEvent(event); - } - - public String getEventString() { - StringBuffer buildOnEvent =3D new StringBuffer(); - String onsubmit =3D getOnsubmit(); - // Insert script to call before submit ajax request. - if (null !=3D onsubmit) { - buildOnEvent.append(onsubmit).append(";"); - } - buildOnEvent.append(AjaxRendererUtils.buildOnEvent(this, - getFacesContext(), getEvent())); - String script =3D buildOnEvent.toString(); - return script; - } - - public UIComponent getSingleComponent() { - return getParent(); - } - - public void encodeAjax(FacesContext context) throws IOException { - AjaxContext ajaxContext =3D AjaxContext.getCurrentInstance(context); - Set renderedAreas =3D ajaxContext.getAjaxRenderedAreas(); - for (UIComponent message : getMessages(context)) { - if (message.isRendered()) { - message.encodeAll(context); - renderedAreas.add(message.getClientId(context)); - } - } - // Write information about encoded areas after submission. - AjaxRendererUtils.encodeAreas(context, this); - } - - public Set getMessages(FacesContext context) { - Set messages =3D new HashSet(); - findMessages(this.getParent(), this, messages,false); - findRichMessages(context, context.getViewRoot(), messages); - return messages; - } - - = - /** - * Find all instances of the {@link UIRichMessages} and update list of th= e rendered messages. - * @param context - * @param component - * @param messages - */ - protected void findRichMessages(FacesContext context,UIComponent componen= t, Set messages) { - Iterator facetsAndChildren =3D component.getFacetsAndChildr= en(); - while (facetsAndChildren.hasNext()) { - UIComponent child =3D (UIComponent) facetsAndChildren.next(); - if (child instanceof UIRichMessages) { - UIRichMessages richMessage =3D (UIRichMessages) child; - if(null =3D=3D richMessage.getFor()){ - richMessage.updateMessages(context, this.getParent().getClientId(cont= ext)); - messages.add(richMessage); - } - } else { - findRichMessages(context, child, messages); - } - } - } - - /** - * Recursive search messages for the parent component. - * @param parent = - * @param component - * @param messages - * @return - */ - protected boolean findMessages(UIComponent parent, UIComponent component, - Set messages,boolean found) { - Iterator facetsAndChildren =3D parent.getFacetsAndChildren(= ); - while (facetsAndChildren.hasNext()) { - UIComponent child =3D (UIComponent) facetsAndChildren.next(); - if (child !=3D component) { - if (child instanceof UIMessage || child instanceof UIMessages) { - UIComponent message =3D (UIComponent) child; - Object targetId =3D message.getAttributes().get("for"); - if (null !=3D targetId - && targetId.equals(getParent().getId())) { - messages.add(message); - found =3D true; - } - } else { - found |=3D findMessages(child, null, messages,found); - } - } - } - if(!(found && parent instanceof NamingContainer) && component !=3D null){ - UIComponent newParent =3D parent.getParent(); - if(null !=3D newParent){ - found =3D findMessages(newParent, parent, messages,found); - } - } - return found; - } - - /* - * (non-Javadoc) - * = - * @see - * org.ajax4jsf.event.AjaxSource#addAjaxListener(org.ajax4jsf.event.AjaxL= istener - * ) - */ - public void addAjaxListener(AjaxListener listener) { - addFacesListener(listener); - } - - /* - * (non-Javadoc) - * = - * @see org.ajax4jsf.event.AjaxSource#getAjaxListeners() - */ - public AjaxListener[] getAjaxListeners() { - return (AjaxListener[]) getFacesListeners(AjaxListener.class); - } - - /* - * (non-Javadoc) - * = - * @seeorg.ajax4jsf.event.AjaxSource#removeAjaxListener(org.ajax4jsf.even= t. - * AjaxListener) - */ - public void removeAjaxListener(AjaxListener listener) { - removeFacesListener(listener); - } - - public void setAjaxListener(MethodExpression listener) { - AjaxListener[] ajaxListeners =3D getAjaxListeners(); - for (int i =3D 0; i < ajaxListeners.length; i++) { - AjaxListener ajaxListener =3D ajaxListeners[i]; - if (ajaxListener.getClass().equals( - MethodExpressionAjaxListener.class)) { - MethodExpressionAjaxListener expressionListener =3D (MethodExpressionA= jaxListener) ajaxListener; - if (expressionListener.getExpression() !=3D listener) { - removeAjaxListener(ajaxListener); - - if (listener =3D=3D null) { - - return; - } else { - - break; - } - } - } - } - - addAjaxListener(new MethodExpressionAjaxListener(listener)); - } - - public MethodExpression getAjaxListener() { - AjaxListener[] ajaxListeners =3D getAjaxListeners(); - for (int i =3D 0; i < ajaxListeners.length; i++) { - AjaxListener ajaxListener =3D ajaxListeners[i]; - if (ajaxListener.getClass().equals( - MethodExpressionAjaxListener.class)) { - MethodExpressionAjaxListener expressionListener =3D (MethodExpressionA= jaxListener) ajaxListener; - return expressionListener.getExpression(); - } - } - - return null; - } -} Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/component/UIGraphValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIGraphValidator.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/UIGraphValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -99,14 +99,14 @@ * = * @return */ - public abstract Set getProfile(); + public abstract Object getProfiles(); = /** * Set set of profiles for validation * = * @param newvalue */ - public abstract void setProfile(Set newvalue); + public abstract void setProfiles(Object newvalue); = /** * Get graph validator Id. @@ -130,7 +130,7 @@ Validator validator =3D context.getApplication().createValidator(getTyp= e()); if (validator instanceof GraphValidator) { GraphValidator graphValidator =3D (GraphValidator) validator; - String[] messages =3D graphValidator.validateGraph(context,this, value= ,getProfile()); + String[] messages =3D graphValidator.validateGraph(context,this, value= ,getProfiles()); if (null !=3D messages) { context.renderResponse(); // send all validation messages. @@ -155,6 +155,12 @@ super.encodeBegin(context); FacesBeanValidator validator =3D (FacesBeanValidator)context.getApplicat= ion().createValidator(getType()); validator.setSummary(getSummary()); + ValueExpression expression =3D getValueExpression("profiles"); + if(null !=3D expression){ + validator.setProfiles(expression); + } else { + validator.setProfiles(getProfiles()); + } setupValidators(this,validator); } = Copied: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfac= es/renderkit/html/AjaxValidatorRenderer.java (from rev 14267, branches/comm= unity/3.3.X/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/Bea= nValidatorRenderer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/r= enderkit/html/AjaxValidatorRenderer.java (rev 0) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/r= enderkit/html/AjaxValidatorRenderer.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,110 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.richfaces.renderkit.html; + + +// = +// Imports +// +import java.io.IOException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.event.ActionEvent; + +import org.ajax4jsf.component.AjaxComponent; +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.event.AjaxEvent; +import org.ajax4jsf.renderkit.AjaxComponentRendererBase; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.ComponentVariables; +import org.ajax4jsf.renderkit.ComponentsVariableResolver; +import org.richfaces.event.ValidationEvent; + + + +/** + * Renderer for component class org.richfaces.renderkit.html.AjaxValidator= Renderer + */ +public class AjaxValidatorRenderer extends AjaxComponentRendererBase { + + = + public static final String RENDERER_TYPE =3D "org.richfaces.BeanValidator= Renderer"; + public AjaxValidatorRenderer () { + super(); + } + + protected void doDecode(FacesContext facesContext, UIComponent uiComponen= t) { + + // super.decode must not be called, because value is handled here + if (isSubmitted(facesContext, uiComponent)) { + uiComponent.queueEvent(new ValidationEvent(uiComponent)); + uiComponent.queueEvent(new AjaxEvent(uiComponent)); + // Check areas for processing + if (uiComponent instanceof AjaxComponent) { + AjaxComponent ajaxComponent =3D (AjaxComponent) uiComponent; + Set toProcess =3D AjaxRendererUtils.asSet(ajaxComponent + .getProcess()); + if (null !=3D toProcess) { + HashSet componentIdsToProcess =3D new HashSet(); + for (String componentId : toProcess) { + UIComponent component =3D getUtils().findComponentFor(uiComponent, c= omponentId); + if(null !=3D component){ + componentIdsToProcess.add(component.getClientId(facesContext)); + } else { + componentIdsToProcess.add(componentId); + } + } + AjaxContext.getCurrentInstance(facesContext).setAjaxAreasToProcess(co= mponentIdsToProcess); + } + } + } + } + + protected boolean isSubmitted(FacesContext facesContext, + UIComponent uiComponent) { + // Componet accept only ajax requests. + if (!AjaxContext.getCurrentInstance(facesContext).isAjaxRequest()) { + return false; + } + String clientId =3D uiComponent.getClientId(facesContext); + Map paramMap =3D facesContext.getExternalContext() + .getRequestParameterMap(); + String value =3D paramMap.get(clientId); + boolean submitted =3D null !=3D value; + return submitted; + } + /** + * Get base component class, targetted for this renderer. Used for check = arguments in decode/encode. + * @return + */ + protected Class getComponentClass() { + return org.richfaces.component.UIAjaxValidator.class; + } = + = + +} Property changes on: branches/community/3.3.X/ui/beanValidator/src/main/jav= a/org/richfaces/renderkit/html/AjaxValidatorRenderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfa= ces/renderkit/html/BeanValidatorRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/r= enderkit/html/BeanValidatorRenderer.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/r= enderkit/html/BeanValidatorRenderer.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -1,110 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ - -package org.richfaces.renderkit.html; - - -// = -// Imports -// -import java.io.IOException; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.event.ActionEvent; - -import org.ajax4jsf.component.AjaxComponent; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.renderkit.AjaxComponentRendererBase; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.renderkit.ComponentVariables; -import org.ajax4jsf.renderkit.ComponentsVariableResolver; -import org.richfaces.event.ValidationEvent; - - - -/** - * Renderer for component class org.richfaces.renderkit.html.BeanValidator= Renderer - */ -public class BeanValidatorRenderer extends AjaxComponentRendererBase { - - = - public static final String RENDERER_TYPE =3D "org.richfaces.BeanValidator= Renderer"; - public BeanValidatorRenderer () { - super(); - } - - protected void doDecode(FacesContext facesContext, UIComponent uiComponen= t) { - - // super.decode must not be called, because value is handled here - if (isSubmitted(facesContext, uiComponent)) { - uiComponent.queueEvent(new ValidationEvent(uiComponent)); - uiComponent.queueEvent(new AjaxEvent(uiComponent)); - // Check areas for processing - if (uiComponent instanceof AjaxComponent) { - AjaxComponent ajaxComponent =3D (AjaxComponent) uiComponent; - Set toProcess =3D AjaxRendererUtils.asSet(ajaxComponent - .getProcess()); - if (null !=3D toProcess) { - HashSet componentIdsToProcess =3D new HashSet(); - for (String componentId : toProcess) { - UIComponent component =3D getUtils().findComponentFor(uiComponent, c= omponentId); - if(null !=3D component){ - componentIdsToProcess.add(component.getClientId(facesContext)); - } else { - componentIdsToProcess.add(componentId); - } - } - AjaxContext.getCurrentInstance(facesContext).setAjaxAreasToProcess(co= mponentIdsToProcess); - } - } - } - } - - protected boolean isSubmitted(FacesContext facesContext, - UIComponent uiComponent) { - // Componet accept only ajax requests. - if (!AjaxContext.getCurrentInstance(facesContext).isAjaxRequest()) { - return false; - } - String clientId =3D uiComponent.getClientId(facesContext); - Map paramMap =3D facesContext.getExternalContext() - .getRequestParameterMap(); - String value =3D paramMap.get(clientId); - boolean submitted =3D null !=3D value; - return submitted; - } - /** - * Get base component class, targetted for this renderer. Used for check = arguments in decode/encode. - * @return - */ - protected Class getComponentClass() { - return org.richfaces.component.UIBeanValidator.class; - } = - = - -} Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/taglib/AjaxValidatorHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/AjaxValidatorHandler.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/AjaxValidatorHandler.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -32,11 +32,12 @@ = import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.webapp.taglib.AjaxComponentHandler; -import org.richfaces.component.UIBeanValidator; +import org.richfaces.component.UIAjaxValidator; import org.richfaces.validator.FacesBeanValidator; = import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; +import com.sun.facelets.tag.MetaRuleset; import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.TagException; import com.sun.facelets.tag.TagHandler; @@ -74,9 +75,15 @@ _event =3D getAttribute("event"); _summary =3D getAttribute("summary"); _profiles =3D getAttribute("profiles"); - _validatorHandler =3D new AjaxComponentHandler(config); + _validatorHandler =3D new AjaxComponentHandler(config){ + @Override + protected MetaRuleset createMetaRuleset(Class type) { + return super.createMetaRuleset(type).ignore("summary").ignore("profile= s"); + } + }; } = + = /* * (non-Javadoc) * = @@ -107,7 +114,7 @@ } if( null !=3D _profiles){ if(_profiles.isLiteral()){ - validator.setProfiles(AjaxRendererUtils.asSet(_profiles.getValue())); + validator.setProfiles(_profiles.getValue()); } else { validator.setProfiles(_profiles.getValueExpression(ctx, Set.class)); } @@ -119,7 +126,7 @@ UIFacet facet =3D new UIFacet(); // Find facet for client validation component String eventName =3D _event.getValue(); - String facetName =3D UIBeanValidator.BEAN_VALIDATOR_FACET + eventName; + String facetName =3D UIAjaxValidator.BEAN_VALIDATOR_FACET + eventName; c =3D parent.getFacet(facetName); if (null !=3D c) { parent.getFacets().remove(facetName); Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/taglib/AjaxValidatorTagBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/AjaxValidatorTagBase.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/AjaxValidatorTagBase.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -28,8 +28,8 @@ import javax.servlet.jsp.JspException; = import org.ajax4jsf.webapp.taglib.UIComponentTagBase; -import org.richfaces.component.UIBeanValidator; -import org.richfaces.renderkit.html.BeanValidatorRenderer; +import org.richfaces.component.UIAjaxValidator; +import org.richfaces.renderkit.html.AjaxValidatorRenderer; import org.richfaces.validator.FacesBeanValidator; = /** @@ -45,6 +45,7 @@ = private ValueExpression summary =3D null; = + private ValueExpression profiles =3D null; /* * (non-Javadoc) * = @@ -52,7 +53,7 @@ */ @Override public String getComponentType() { - return UIBeanValidator.COMPONENT_TYPE; + return UIAjaxValidator.COMPONENT_TYPE; } = /** @@ -98,8 +99,19 @@ .getApplication().createValidator( FacesBeanValidator.BEAN_VALIDATOR_TYPE); if (null !=3D summary) { - validator.setSummary(summary); + if(summary.isLiteralText()){ + validator.setSummary(summary.getExpressionString()); + } else { + validator.setSummary(summary); + } } + if(null !=3D profiles){ + if(profiles.isLiteralText()){ + validator.setProfiles(profiles.getExpressionString()); = + } else { + validator.setProfiles(profiles); + } + } ((EditableValueHolder) component).addValidator(validator); = } @@ -117,6 +129,7 @@ super.release(); event =3D null; summary =3D null; + profiles =3D null; } = /* @@ -126,12 +139,12 @@ */ @Override public String getRendererType() { - return BeanValidatorRenderer.RENDERER_TYPE; + return AjaxValidatorRenderer.RENDERER_TYPE; } = @Override protected String getFacetName() { - return UIBeanValidator.BEAN_VALIDATOR_FACET + return UIAjaxValidator.BEAN_VALIDATOR_FACET + (null =3D=3D event ? "" : event); } } Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/taglib/BeanValidatorHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/BeanValidatorHandler.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/BeanValidatorHandler.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -20,11 +20,15 @@ */ package org.richfaces.taglib; = +import java.util.Set; + import javax.faces.validator.Validator; = +import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.richfaces.validator.FacesBeanValidator; = import com.sun.facelets.FaceletContext; +import com.sun.facelets.tag.MetaRuleset; import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.TagConfig; import com.sun.facelets.tag.jsf.ValidateHandler; @@ -36,14 +40,17 @@ */ public class BeanValidatorHandler extends ValidateHandler { = - private TagAttribute _summary; = + private TagAttribute _profiles; + + = + /** * @param config */ - public BeanValidatorHandler(TagConfig config) { + public BeanValidatorHandler(ValidatorConfig config) { super(config); - _summary =3D getAttribute("summary"); + _profiles =3D getAttribute("profiles"); } = @Override @@ -51,9 +58,12 @@ FacesBeanValidator validator =3D (FacesBeanValidator) ctx.getFacesContex= t() .getApplication().createValidator( FacesBeanValidator.BEAN_VALIDATOR_TYPE); - if (null !=3D _summary) { - validator - .setSummary(_summary.getValueExpression(ctx, String.class)); + if(null !=3D _profiles){ + if(_profiles.isLiteral()){ + validator.setProfiles(AjaxRendererUtils.asSet(_profiles.getValue())); + } else { + validator.setProfiles(_profiles.getValueExpression(ctx, Set.class)); + } } return validator; } Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/taglib/BeanValidatorTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/BeanValidatorTag.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/BeanValidatorTag.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -48,6 +48,9 @@ * implements {@link HibernateValidator}.

      */ private ValueExpression binding =3D null; + = + = + private ValueExpression profiles =3D null; = /** * Summary message for a validation errors. Setter for summary @@ -70,6 +73,13 @@ this.binding =3D binding; } = + /** + * @param profiles the profiles to set + */ + public void setProfiles(ValueExpression profiles) { + this.profiles =3D profiles; + } + protected Validator createValidator() throws JspException { ValueExpression ve =3D this.binding; = @@ -101,13 +111,29 @@ return validator; } = + @Override + public void release() { + this.binding =3D null; + this._summary =3D null; + this.profiles =3D null; + super.release(); + } // Support method to wire in properties private void _setProperties(FacesBeanValidator validator) throws JspException { if (_summary !=3D null) { - if (_summary instanceof ValueExpression) { + if (_summary.isLiteralText()) { + validator.setSummary(_summary.getExpressionString()); + } else { validator.setSummary(_summary); } } + if(null !=3D profiles){ + if(profiles.isLiteralText()){ + validator.setProfiles(profiles.getExpressionString()); = + } else { + validator.setProfiles(profiles); + } } + } } Added: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richface= s/taglib/GraphValidatorHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/GraphValidatorHandler.java (rev 0) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/t= aglib/GraphValidatorHandler.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -0,0 +1,57 @@ +/** + * = + */ +package org.richfaces.taglib; + +import java.util.Set; + +import javax.faces.component.UIComponent; + +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.richfaces.component.UIGraphValidator; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.tag.MetaRuleset; +import com.sun.facelets.tag.TagAttribute; +import com.sun.facelets.tag.jsf.ComponentConfig; +import com.sun.facelets.tag.jsf.ComponentHandler; + +/** + * @author asmirnov + * + */ +public class GraphValidatorHandler extends ComponentHandler { + + private TagAttribute _profiles; + + /** + * @param config + */ + public GraphValidatorHandler(ComponentConfig config) { + super(config); + _profiles =3D getAttribute("profiles"); + } + + @Override + protected MetaRuleset createMetaRuleset(Class type) { + return super.createMetaRuleset(type).ignore("profiles"); + } + = + = + @Override + protected void onComponentCreated(FaceletContext ctx, UIComponent c, + UIComponent parent) { + super.onComponentCreated(ctx, c, parent); + if (c instanceof UIGraphValidator) { + UIGraphValidator graphValidator =3D (UIGraphValidator) c; + if(null !=3D _profiles){ + if (_profiles.isLiteral()) { + graphValidator.setProfiles(AjaxRendererUtils.asSet(_profiles.getValue= ())); + } else { + graphValidator.setValueExpression("profiles", _profiles.getValueExpre= ssion(ctx, Set.class)); + } + } + = + } + } +} Property changes on: branches/community/3.3.X/ui/beanValidator/src/main/jav= a/org/richfaces/taglib/GraphValidatorHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/validator/BeanValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/BeanValidator.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/BeanValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -15,6 +15,7 @@ import javax.validation.Validator; import javax.validation.ValidatorContext; import javax.validation.ValidatorFactory; +import javax.validation.groups.Default; = /** * @author asmirnov @@ -22,6 +23,7 @@ */ public class BeanValidator extends ObjectValidator { = + private static final Class[] DEFAULT_PROFILE =3D new Class[] {}; private volatile ValidatorFactory validatorFactory =3D null; = BeanValidator() { @@ -38,8 +40,10 @@ @Override protected String[] validate(Object base, String property, Object value, Locale locale, Set profiles) { - return extractMessages(getValidator(locale).validateProperty(base, - property, getGroups(profiles))); + Class beanType =3D base.getClass(); + Set> constrains =3D getValidator(locale) + .validateValue(beanType, property, value, getGroups(profiles)); + return extractMessages(constrains); } = /* @@ -79,6 +83,8 @@ i++; } = + } else { + groups =3D DEFAULT_PROFILE; } return groups; } @@ -88,7 +94,7 @@ if (null !=3D violations && violations.size() > 0) { messages =3D new String[violations.size()]; int i =3D 0; - for (ConstraintViolation constraintViolation : violations) { + for (ConstraintViolation constraintViolation : violat= ions) { messages[i++] =3D constraintViolation.getMessage(); } = @@ -97,7 +103,6 @@ } = protected Validator getValidator(Locale locale) { - validatorFactory =3D null; if (null =3D=3D validatorFactory) { synchronized (this) { if (null =3D=3D validatorFactory) { @@ -134,7 +139,13 @@ } = public String interpolate(String messageTemplate, Context context) { - return delegate.interpolate(messageTemplate, context, this.locale); + + if (null !=3D locale) { + return delegate.interpolate(messageTemplate, context, + this.locale); + } else { + return delegate.interpolate(messageTemplate, context); + } } = public String interpolate(String messageTemplate, Context context, Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/validator/FacesBeanValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/FacesBeanValidator.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/FacesBeanValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -33,6 +33,8 @@ import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; = +import org.ajax4jsf.renderkit.AjaxRendererUtils; + /** * Implementation of the JSF validator to use with Bean Validation / Hiber= nate * validator @@ -54,7 +56,7 @@ = private ValueExpression profilesExpression =3D null; = - private Set profiles =3D null; + private Object profiles =3D null; /** * @return the summary */ @@ -119,30 +121,29 @@ } = public String[] validateGraph(FacesContext context, UIComponent component, - Object value, Set profiles) throws ValidatorException { + Object value, Object profiles) throws ValidatorException { ObjectValidator beanValidator =3D HibernateValidator.getInstance(context= ); - String[] messages =3D beanValidator.validateGraph(context, value,profile= s); + String[] messages =3D beanValidator.validateGraph(context, value,AjaxRen= dererUtils.asSet(profiles)); return messages; } = /** * @return the profiles */ - @SuppressWarnings("unchecked") public Set getProfiles() { - Set profiles; + Object profiles; if(null !=3D profilesExpression){ - profiles =3D (Set) profilesExpression.getValue(FacesContext.ge= tCurrentInstance().getELContext()); + profiles =3D profilesExpression.getValue(FacesContext.getCurrentInstan= ce().getELContext()); }else { profiles =3D this.profiles; } - return profiles; + return AjaxRendererUtils.asSet(profiles); } = /** * @param profiles the profiles to set */ - public void setProfiles(Set profiles) { + public void setProfiles(Object profiles) { this.profiles =3D profiles; } = Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/validator/GraphValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/GraphValidator.java 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/GraphValidator.java 2009-05-22 00:28:52 UTC (rev 14273) @@ -19,6 +19,6 @@ public interface GraphValidator { = public String[] validateGraph(FacesContext context, UIComponent component= , Object value, - Set profiles) throws ValidatorException ; + Object profiles) throws ValidatorException ; = } Modified: branches/community/3.3.X/ui/beanValidator/src/main/templates/org/= richfaces/ui/htmlBeanValidator.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/templates/org/richfa= ces/ui/htmlBeanValidator.jspx 2009-05-21 18:33:06 UTC (rev 14272) +++ branches/community/3.3.X/ui/beanValidator/src/main/templates/org/richfa= ces/ui/htmlBeanValidator.jspx 2009-05-22 00:28:52 UTC (rev 14273) @@ -5,9 +5,9 @@ xmlns:ui=3D" http://ajax4jsf.org/cdk/ui" xmlns:u=3D" http://ajax4jsf.org/cdk/u" xmlns:x=3D" http://ajax4jsf.org/cdk/x" - class=3D"org.richfaces.renderkit.html.BeanValidatorRenderer" + class=3D"org.richfaces.renderkit.html.AjaxValidatorRenderer" baseclass=3D"org.ajax4jsf.renderkit.AjaxComponentRendererBase" - component=3D"org.richfaces.component.UIBeanValidator" = + component=3D"org.richfaces.component.UIAjaxValidator" = >
      --===============9117784767399331348== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-22 05:01:35 -0400 (Fri, 22 May 2009) New Revision: 14274 Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richfaces= /htmlColorPicker.jspx Log: change alt=3D"icon" to alt=3D"" Modified: branches/community/3.3.X/ui/colorPicker/src/main/templates/org/ri= chfaces/htmlColorPicker.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-22 00:28:52 UTC (rev 14273) +++ branches/community/3.3.X/ui/colorPicker/src/main/templates/org/richface= s/htmlColorPicker.jspx 2009-05-22 09:01:35 UTC (rev 14274) @@ -36,7 +36,7 @@ - 3D"icon"/ + 3D""/ --===============9117784767399331348==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 05:46:00 2009 Content-Type: multipart/mixed; boundary="===============0148839721375998387==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14275 - in branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/seamtext: tags and 1 other directory. Date: Fri, 22 May 2009 05:39:31 -0400 Message-ID: --===============0148839721375998387== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-22 05:39:30 -0400 (Fri, 22 May 2009) New Revision: 14275 Added: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/ParagraphTag.java Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/HtmlToSeamTransformer.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/HtmlTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/LineTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/TagFactory.java Log: Editor: "Preformatted" format problem in seamTextMode https://jira.jboss.org/jira/browse/RF-7030 Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/HtmlToSeamTransformer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/HtmlToSeamTransformer.java 2009-05-22 09:01:35 UTC (rev 14274) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/HtmlToSeamTransformer.java 2009-05-22 09:39:30 UTC (rev 14275) @@ -35,8 +35,6 @@ = private HtmlTag currentTag =3D null; = - private boolean isHeaderProcessed =3D false; - private boolean isFirstChars =3D false; = public Stack getHtmlElementStack() { @@ -107,70 +105,80 @@ return false; } = - public void text(char[] text, int start, int length) { - if (isFirstChars) { -// append(htmlElementStack.peek().printStartSuffix()); + class StringCollector { + private int start =3D -1; = - while (text[start] =3D=3D '\n' && length > 0) { - start++; - length--; - } - isFirstChars =3D false; + public StringCollector(int start) { + this.start =3D start; } + = + public void inc() { + start++; + } + = + public void dec() { + start--; + } + = + public void clear() { + start =3D -1; + } + = + public int getStart() { + return start; + } + } + = + public void text(char[] text, int start, int length) { + int localStart =3D -1; + = + while (length > 0) { + switch (text[start]) { + case '*': case '|': case '^' : case '+': + case '=3D': case '#': case '\\': case '~': + case '[': case ']': case '`' : + case '<': case '>': case '&': + if (localStart !=3D -1) { + out(text, localStart, start - localStart); + localStart =3D -1; + } = + = + seamCharacters(text, start, 1); + break; = + case '\n': case '\r': + if (localStart !=3D -1) { + out(text, localStart, start - localStart); + localStart =3D -1; + } = = - while (length > 0) { - processChar(text, start, 1); + final HtmlTag token =3D htmlElementStack.peek(); + if (!(HtmlToSeamSAXParser.ROOT_TAG_NAME.equals(token.g= etName()) + || token.isList())) { + out(text, start, 1); + } = - setHeaderProcessed(); + break; + default: + if (localStart =3D=3D -1) { + localStart =3D start; + } + } = start ++; length --; } + = + if (localStart !=3D -1) { + out(text, localStart, start - localStart); + localStart =3D -1; + } = } = - private void setHeaderProcessed() { - final HtmlTag token =3D htmlElementStack.peek(); - if (!token.isParagraph() && isHeaderProcessed) { - isHeaderProcessed =3D false; - } - } - - private void processChar(final char[] text, final int start, final int= localLength) { - switch (text[start]) { - case '*': case '|': case '^' : case '+': - case '=3D': case '#': case '\\': case '~': - case '[': case ']': case '`' : - case '<': case '>': case '&': - seamCharacters(text, start, localLength); - break; - - case '\n': - final HtmlTag token =3D htmlElementStack.peek(); - if (!(/*token.isParagraph() - ||*/ isHeaderProcessed - || HtmlToSeamSAXParser.ROOT_TAG_NAME.equals(token.ge= tName()) - || token.isList())) { - out(text, start, localLength); - } - - break; - default: - out(text, start, localLength); - break; - } - } - public void seamCharacters(char[] text, int start, int length) { appendBody(escapeSeamText(new String(text, start, length), preform= atted)); } = - public void plain(char[] text, int start, int length) { - out(text, start, length); - - setHeaderProcessed(); - } - public void out(char[] text, int start, int length) { appendBody(new String(text, start, length)); } @@ -228,11 +236,7 @@ = if (tag.isLink()) { value =3D ""; - } else if (tag.isParagraph()) { - isHeaderProcessed =3D false; - } else if (tag.isHeader()) { - isHeaderProcessed =3D true; - } + } = = appendBody(value); appendEnd(); Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/HtmlTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/HtmlTag.java 2009-05-22 09:01:35 UTC (rev 14274) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/HtmlTag.java 2009-05-22 09:39:30 UTC (rev 14275) @@ -64,11 +64,12 @@ } = protected boolean isBreakLineChild(Object child) { - if (!(child instanceof String)) { + if (child =3D=3D null || !(child instanceof String)) { return false; } + = final String str =3D (String) child; - return "\r".equals(str) || "\n".equals(str) || "\r\n".equals(str); + return str.endsWith("\r") || str.endsWith("\n"); } = protected String printPlainStart(){ Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/LineTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LineTag.java 2009-05-22 09:01:35 UTC (rev 14274) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LineTag.java 2009-05-22 09:39:30 UTC (rev 14275) @@ -26,7 +26,29 @@ return super.printPlain(); } = + private boolean isFirstChars =3D true; + = @Override + public void appendBody(String str) { + if (isFirstChars) { + char text[] =3D str.toCharArray(); + int i =3D 0; + while (i < text.length && (text[i] =3D=3D '\r' || text[i] =3D= =3D '\n')) { + i++; + } + = + if (i < text.length) { + super.appendBody(str.substring(i)); + isFirstChars =3D false; + } else { + return; + } + } else { + super.appendBody(str); + } + } + + @Override protected void appendChildTag(StringBuilder res, HtmlTag child) { if (child instanceof LineTag) { res.append(((LineTag)child).printPlain()); @@ -36,6 +58,15 @@ } = @Override + protected String printBody() { + while (!isBodyEmpty() && isBreakLineChild(body.getLast())) { + body.removeLast(); + } + = + return super.printBody(); + } + = + @Override public String printEnd() { return "\n"; } Added: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/conve= rt/seamtext/tags/ParagraphTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/ParagraphTag.java (rev 0) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/ParagraphTag.java 2009-05-22 09:39:30 UTC (rev 14275) @@ -0,0 +1,25 @@ +package org.richfaces.convert.seamtext.tags; + +public class ParagraphTag extends LineTag { + + private static final long serialVersionUID =3D 1720000557944774249L; + + protected ParagraphTag() { + super(P); + } + = + @Override + public String printStart() { + return ""; + } + + @Override + public String printEnd() { + return "\n\n"; = + } + + @Override + public String printStartSuffix() { + return ""; + } +} Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/TagFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/TagFactory.java 2009-05-22 09:01:35 UTC (rev 14274) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/TagFactory.java 2009-05-22 09:39:30 UTC (rev 14275) @@ -55,31 +55,7 @@ } }, = - new HtmlTag(P) { - @Override - public String printStart() { - return ""; - } - - @Override - protected String printBody() { - while (isBreakLineChild(body.getLast())) { - body.removeLast(); - } - = - return super.printBody(); - } - - @Override - public String printEnd() { - return "\n\n"; = - } - - @Override - public String printStartSuffix() { - return ""; - } - }, = + new ParagraphTag(), = = new FormattingTag(I, SEAM_STAR), new FormattingTag(DEL, SEAM_TWIDDLE), --===============0148839721375998387==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 09:21:10 2009 Content-Type: multipart/mixed; boundary="===============7287775555128515342==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14276 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7203. Date: Fri, 22 May 2009 09:14:39 -0400 Message-ID: --===============7287775555128515342== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-22 09:14:39 -0400 (Fri, 22 May 2009) New Revision: 14276 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7203/Test.java Log: RF-7203 java bean. Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-tests/src/test/java/org/richfaces/testng/rf7203/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7203/Test.java 2009-05-22 09:3= 9:30 UTC (rev 14275) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7203/Test.java 2009-05-22 13:1= 4:39 UTC (rev 14276) @@ -8,9 +8,20 @@ public void testExecute() throws Exception { renderPage(); = - clickCommandAndWait("form:link"); + clickById("form:link"); AssertVisible("form:contextMenu"); - clickAjaxCommandAndWait("form:contextMenu:menuItem"); = + = + clickAjaxCommandAndWait("form:menuItem"); = + String str =3D selenium.getAlert(); + System.out.println(str); + = + try{ + if(str.equalsIgnoreCase("oncomplete")){ + throw new AssertionError("'oncomplete' alert still appears."); + }}catch (Exception e) { + System.err.println(e.getStackTrace()); + } = + = } = @Override --===============7287775555128515342==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 09:22:00 2009 Content-Type: multipart/mixed; boundary="===============2124848846874171440==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14277 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Fri, 22 May 2009 09:15:28 -0400 Message-ID: --===============2124848846874171440== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-22 09:15:26 -0400 (Fri, 22 May 2009) New Revision: 14277 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf7203.xhtml Log: RF-7203 test page. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf7203.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7203.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7203.xhtml 2009-05-22 13:15:26 UTC (rev 14277) @@ -0,0 +1,28 @@ + + + + + + + + Click me! + + + + + + Select this + + + + + + \ No newline at end of file --===============2124848846874171440==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 09:23:31 2009 Content-Type: multipart/mixed; boundary="===============9044763090609694002==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14278 - in branches/community/3.3.X/ui/beanValidator/src/main: java/org/richfaces/component/html and 1 other directories. Date: Fri, 22 May 2009 09:17:00 -0400 Message-ID: --===============9044763090609694002== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-22 09:17:00 -0400 (Fri, 22 May 2009) New Revision: 14278 Added: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/html/HtmlInputSecret.java Modified: branches/community/3.3.X/ui/beanValidator/src/main/config/faces/standart= -components.xml branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/html/HtmlInputText.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/va= lidator/HibernateValidator.java Log: InputSecret: empty values are not validated https://jira.jboss.org/jira/browse/RF-7180 Modified: branches/community/3.3.X/ui/beanValidator/src/main/config/faces/s= tandart-components.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/config/faces/standar= t-components.xml 2009-05-22 13:15:26 UTC (rev 14277) +++ branches/community/3.3.X/ui/beanValidator/src/main/config/faces/standar= t-components.xml 2009-05-22 13:17:00 UTC (rev 14278) @@ -8,10 +8,15 @@ org.richfaces.component.html.HtmlInputText + Represents an HTML element.

      ]]>       + Input Secret + javax.faces.HtmlInputSecret + org.richfaces.component.html.HtmlInputSecret +       + Represents an HTML textarea elem= ent.

      ]]>       Input Textarea javax.faces.HtmlInputTextarea org.richfaces.component.html.HtmlInputTextarea - =       = \ No newline at end of file Added: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richface= s/component/html/HtmlInputSecret.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputSecret.java (rev 0) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputSecret.java 2009-05-22 13:17:00 UTC (rev 14278) @@ -0,0 +1,72 @@ +package org.richfaces.component.html; + +import java.util.List; + +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; + +import org.richfaces.validator.FacesBeanValidator; + +public class HtmlInputSecret extends javax.faces.component.html.HtmlInputS= ecret { + = + @Override + protected void validateValue(FacesContext context, Object newValue) { + // If our value is valid, enforce the required property if present + if (isValid() && isRequired() && isEmpty(newValue)) { + super.validateValue(context, newValue); + } + // If our value is valid and not empty, call all validators + if (isValid()) { + Validator[] validators =3D this.getValidators(); + if (validators !=3D null) { + for (Validator validator : validators) { + try { + if (validator instanceof FacesBeanValidator + || !isEmpty(newValue)) { + validator.validate(context, this, newValue); + } + } catch (ValidatorException ve) { + // If the validator throws an exception, we're + // invalid, and we need to add a message + setValid(false); + FacesMessage message; + String validatorMessageString =3D getValidatorMess= age(); + + if (null !=3D validatorMessageString) { + message =3D new FacesMessage( + FacesMessage.SEVERITY_ERROR, + validatorMessageString, + validatorMessageString); + message.setSeverity(FacesMessage.SEVERITY_ERRO= R); + } else { + message =3D ve.getFacesMessage(); + } + if (message !=3D null) { + context.addMessage(getClientId(context), messa= ge); + } + } + } + } + } + } + + private static boolean isEmpty(Object value) { + + if (value =3D=3D null) { + return true; + } else if ((value instanceof String) && (((String) value).length()= < 1)) { + return true; + } else if (value.getClass().isArray()) { + if (0 =3D=3D java.lang.reflect.Array.getLength(value)) { + return true; + } + } else if (value instanceof List) { + if (((List) value).isEmpty()) { + return true; + } + } + return false; + } +} Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/component/html/HtmlInputText.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputText.java 2009-05-22 13:15:26 UTC (rev 14277) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputText.java 2009-05-22 13:17:00 UTC (rev 14278) @@ -80,19 +80,19 @@ private static boolean isEmpty(Object value) { = if (value =3D=3D null) { - return (true); + return true; } else if ((value instanceof String) && (((String) value).length() < 1))= { - return (true); + return true; } else if (value.getClass().isArray()) { if (0 =3D=3D java.lang.reflect.Array.getLength(value)) { - return (true); + return true; } } else if (value instanceof List) { - if (((List) value).isEmpty()) { - return (true); + if (((List) value).isEmpty()) { + return true; } } - return (false); + return false; } = } Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/validator/HibernateValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/HibernateValidator.java 2009-05-22 13:15:26 UTC (rev 14277) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/v= alidator/HibernateValidator.java 2009-05-22 13:17:00 UTC (rev 14278) @@ -91,8 +91,9 @@ */ protected InvalidValue[] validateClass(Class beanClass, String property, Object value, Locale locale) { - ClassValidator classValidator =3D getValidator( - beanClass, locale); + ClassValidator classValidator =3D = + getValidator(beanClass, locale); + = InvalidValue[] invalidValues =3D classValidator .getPotentialInvalidValues(property, value); return invalidValues; @@ -158,11 +159,11 @@ */ protected InvalidValue[] validateBean(Object base, String property, Objec= t value, Locale locale) { - Class beanClass =3D base.getClass(); - InvalidValue[] invalidValues =3D validateClass(beanClass, property, - value, locale); - return invalidValues; - } + Class beanClass =3D base.getClass(); + = + InvalidValue[] invalidValues =3D validateClass(beanClass, property, valu= e, locale); + return invalidValues; + } = = } --===============9044763090609694002==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 09:53:29 2009 Content-Type: multipart/mixed; boundary="===============5964705132212403312==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14279 - in branches/community/3.3.X/ui: editor/src/main/java/org/richfaces/convert/seamtext/tags and 1 other directory. Date: Fri, 22 May 2009 09:46:58 -0400 Message-ID: --===============5964705132212403312== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-22 09:46:58 -0400 (Fri, 22 May 2009) New Revision: 14279 Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/co= mponent/html/HtmlInputSecret.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/EmptyHtmlTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/FormattingTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/HtmlTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/LineTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/LinkTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/OrderedListTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/ParagraphTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/RootTag.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/TagFactory.java branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/s= eamtext/tags/UnorderedListTag.java Log: add copyright Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richf= aces/component/html/HtmlInputSecret.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputSecret.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/c= omponent/html/HtmlInputSecret.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,23 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ package org.richfaces.component.html; = import java.util.List; @@ -9,6 +29,10 @@ = import org.richfaces.validator.FacesBeanValidator; = +/** + * @author Alex.Kolonitsky + * @since 3.3.2.CR1 + * */ public class HtmlInputSecret extends javax.faces.component.html.HtmlInputS= ecret { = @Override Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/EmptyHtmlTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/EmptyHtmlTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/EmptyHtmlTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = public class EmptyHtmlTag extends HtmlTag { Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/FormattingTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/FormattingTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/FormattingTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = class FormattingTag extends HtmlTag { Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/HtmlTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/HtmlTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/HtmlTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = import java.io.Serializable; @@ -2,3 +23,2 @@ import java.util.LinkedList; -import java.util.List; import java.util.Map; Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/LineTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LineTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LineTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = class LineTag extends HtmlTag { Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/LinkTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LinkTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/LinkTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = class LinkTag extends HtmlTag { Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/OrderedListTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/OrderedListTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/OrderedListTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = class OrderedListTag extends UnorderedListTag { Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/ParagraphTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/ParagraphTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/ParagraphTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,5 +1,31 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = + +/** + * @author Alex.Kolonitsky + * @since 3.3.2.CR1 + * */ public class ParagraphTag extends LineTag { = private static final long serialVersionUID =3D 1720000557944774249L; Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/RootTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/RootTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/RootTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = import java.util.LinkedList; Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/TagFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/TagFactory.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/TagFactory.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = import static org.richfaces.convert.seamtext.tags.HtmlTag.*; @@ -69,7 +90,6 @@ } }, = -// getNewTagDefinition(PRE, SEAM_BACKTICK, SEAM_BACKTICK), getNewTagDefinition(Q, SEAM_DOUBLEQUOTE, SEAM_DOUBLEQUOTE), = new LinkTag(), Modified: branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/co= nvert/seamtext/tags/UnorderedListTag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/UnorderedListTag.java 2009-05-22 13:17:00 UTC (rev 14278) +++ branches/community/3.3.X/ui/editor/src/main/java/org/richfaces/convert/= seamtext/tags/UnorderedListTag.java 2009-05-22 13:46:58 UTC (rev 14279) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + package org.richfaces.convert.seamtext.tags; = class UnorderedListTag extends LineTag { --===============5964705132212403312==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 09:59:21 2009 Content-Type: multipart/mixed; boundary="===============0199763940029221179==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14280 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf7172 and 1 other directory. Date: Fri, 22 May 2009 09:52:50 -0400 Message-ID: --===============0199763940029221179== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-22 09:52:50 -0400 (Fri, 22 May 2009) New Revision: 14280 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7172/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7172/Test.java Log: RF-7172 java bean test. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf7172/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7172/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7172/Test.java 2009-05-22 13:5= 2:50 UTC (rev 14280) @@ -0,0 +1,32 @@ +package org.richfaces.testng.rf7172; + +import org.richfaces.SeleniumTestBase; + +public class Test extends SeleniumTestBase { + + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); + + // click 'click' link + clickById("form:clickID"); + // the context menu should appears + AssertVisible("form:contextMenu"); + // click menu item + clickById("form:menuItem"); + // get alert message + String str =3D selenium.getAlert(); + + try { + if (!str.equalsIgnoreCase("testValue")) + throw new AssertionError("params test failed."); + } catch (Exception e) { + System.err.println(e.getStackTrace()); + } + } + + @Override + public String getTestUrl() { + return "pages/rf7172.xhtml"; + } +} --===============0199763940029221179==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 10:00:40 2009 Content-Type: multipart/mixed; boundary="===============6113971167959224181==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14281 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Fri, 22 May 2009 09:54:09 -0400 Message-ID: --===============6113971167959224181== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-22 09:54:09 -0400 (Fri, 22 May 2009) New Revision: 14281 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf7172.xhtml Log: RF-7172 test page. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf7172.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7172.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7172.xhtml 2009-05-22 13:54:09 UTC (rev 14281) @@ -0,0 +1,28 @@ + + + + + + + + click + + + + + + + + Test + + + + + + + \ No newline at end of file --===============6113971167959224181==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 10:58:43 2009 Content-Type: multipart/mixed; boundary="===============3315039720076704221==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14282 - in branches/community/3.3.X/ui/combobox/src/main: templates and 1 other directory. Date: Fri, 22 May 2009 10:52:12 -0400 Message-ID: --===============3315039720076704221== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-22 10:52:11 -0400 (Fri, 22 May 2009) New Revision: 14282 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/re= nderkit/html/scripts/combobox.js branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx Log: https://jira.jboss.org/jira/browse/RF-5524 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richf= aces/renderkit/html/scripts/combobox.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 13:54:09 UTC (rev 14281) +++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 14:52:11 UTC (rev 14282) @@ -7,7 +7,7 @@ initialize: function(combobox, listId, parentListId, valueFieldId, fieldI= d, buttonId, buttonBGId, shadowId, commonStyles, userStyles, = listWidth, listHeight, itemsText, directInputSuggestions, filterNew= Value, = selectFirstOnUpdate, onlistcall, onlistclose, onselected, defaultMe= ssage, isDisabled, value, - showDelay, hideDelay) { + showDelay, hideDelay, onchange) { = this.directInputSuggestions =3D directInputSuggestions; this.filterNewValue =3D filterNewValue; @@ -15,7 +15,8 @@ this.comboValue =3D document.getElementById(valueFieldId); = this.field =3D document.getElementById(fieldId); = this.tempItem; - = + this.onchange =3D onchange; + = this.BUTTON_WIDTH =3D 17; //px = this.classes =3D Richfaces.mergeStyles(userStyles,commonStyles.getCommon= Styles()); @@ -369,7 +370,13 @@ } = var value =3D jQuery(this.comboList.activeItem).text(); - = + = + if(this.comboValue && value) { + if(this.comboValue.value !=3D value) { + Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value= :value}); + } = + } = + = if (toSetOnly) { var oV =3D this.field.value; = if (oV =3D=3D value) { Modified: branches/community/3.3.X/ui/combobox/src/main/templates/combobox.= jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2= 009-05-22 13:54:09 UTC (rev 14281) +++ branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2= 009-05-22 14:52:11 UTC (rev 14282) @@ -217,7 +217,6 @@ value=3D"#{value}" = x:onblur=3D"#{component.attributes['onblur']}" onfocus =3D "#{component.attributes['onfocus']}" - onchange =3D "#{component.attributes['onchange']}" style=3D"width:#{correction}; #{inputInactiveStyle}" autocomplete=3D"off" tabindex=3D"#{component.attributes['tabindex']}" @@ -360,7 +359,7 @@ #{this:getAsEventHandler(context, component, "onselect")}, "#{defaultLabel}", #{disabled}, #{convertedValue}, = - #{component.attributes["showDelay"]}, #{component.attribute= s["hideDelay"]}); + #{component.attributes["showDelay"]}, #{component.attribute= s["hideDelay"]}, #{this:getAsEventHandler(context, component, "onchange")});
      = --===============3315039720076704221==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 11:15:58 2009 Content-Type: multipart/mixed; boundary="===============7356385985020308648==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14283 - branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts. Date: Fri, 22 May 2009 11:09:26 -0400 Message-ID: --===============7356385985020308648== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-22 11:09:26 -0400 (Fri, 22 May 2009) New Revision: 14283 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/re= nderkit/html/scripts/combobox.js Log: Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richf= aces/renderkit/html/scripts/combobox.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 14:52:11 UTC (rev 14282) +++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 15:09:26 UTC (rev 14283) @@ -371,11 +371,10 @@ = var value =3D jQuery(this.comboList.activeItem).text(); = - if(this.comboValue && value) { - if(this.comboValue.value !=3D value) { - Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value= :value}); - } = + if(this.comboValue.value !=3D value) { + Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value:= value}); } = + = if (toSetOnly) { var oV =3D this.field.value; = --===============7356385985020308648==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 11:24:23 2009 Content-Type: multipart/mixed; boundary="===============6095526283877056037==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14284 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included. Date: Fri, 22 May 2009 11:17:51 -0400 Message-ID: --===============6095526283877056037== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-22 11:17:51 -0400 (Fri, 22 May 2009) New Revision: 14284 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/tre= e.xml Log: https://jira.jboss.org/jira/browse/RF-2329 - updating the 'Details of usage= ' section; Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/inclu= ded/tree.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/tr= ee.xml 2009-05-22 15:09:26 UTC (rev 14283) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/tr= ee.xml 2009-05-22 15:17:51 UTC (rev 14284) @@ -554,11 +554,13 @@ component uses a data model to r= epresent the tree-like nodes structure on the page. To identify a p= articular node during a client request, the model provides a set of = unique keys for tree - nodes. The tree can use= strings as keys values + nodes. The + <rich:tree> + can use strings as keys values which may contain special characters not all= owed by browsers, such as the left angle bracket (<), ampersand (&a= mp;), ant etc. Thus, to have a possibility to use unallowed characte= rs in the - tree nodes, t= he following converters + tree nodes ke= ys, the following converters are provided: @@ -632,17 +634,7 @@ } = ...]]> = - This is the result: - = -
      - The tree with the <code>org.richfaces= .TreeRowKeyConverter</code> usage - - - - - -
      - + =
      Built-In Drag and Drop --===============6095526283877056037==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 12:27:27 2009 Content-Type: multipart/mixed; boundary="===============8050824253723732694==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14285 - branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts. Date: Fri, 22 May 2009 12:20:55 -0400 Message-ID: --===============8050824253723732694== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2009-05-22 12:20:55 -0400 (Fri, 22 May 2009) New Revision: 14285 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/re= nderkit/html/scripts/combobox.js Log: Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richf= aces/renderkit/html/scripts/combobox.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 15:17:51 UTC (rev 14284) +++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-22 16:20:55 UTC (rev 14285) @@ -370,8 +370,8 @@ } = var value =3D jQuery(this.comboList.activeItem).text(); - = - if(this.comboValue.value !=3D value) { + = + if((this.comboValue.value && (this.comboValue.value !=3D value)) { Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value:= value}); } = = --===============8050824253723732694==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 12:43:13 2009 Content-Type: multipart/mixed; boundary="===============3620874294431118393==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14286 - in branches/community/3.3.X/ui/dataTable/src: main/java/org/richfaces/renderkit/html and 5 other directories. Date: Fri, 22 May 2009 12:36:41 -0400 Message-ID: --===============3620874294431118393== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-22 12:36:40 -0400 (Fri, 22 May 2009) New Revision: 14286 Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/AbstractDefinitionListRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/AbstractGridRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/AbstractListRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/AbstractRowsRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/AbstractTableRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/CellRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/html/ColgroupRenderer.java branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/render= kit/html/SubTableRenderer.java branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/r= enderkit/html/css/table.xcss branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/d= atatable/css/table.xcss branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/h= tmlDataDefinitionList.jspx branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/h= tmlDataGrid.jspx branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/h= tmlDataList.jspx branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/h= tmlDataOrderedList.jspx branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/h= tmlDataTable.jspx branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compon= ent/DataDefinitionListComponentsTest.java branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compon= ent/DataGridComponentTest.java branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compon= ent/DataListComponentsTest.java branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compon= ent/DataOrderedListComponentsTest.java branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/render= kit/DataTableRenderingTest.java branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/render= kit/SortableHeaderRenderingTest.java Log: RF-7216 RF-7217 Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces= /renderkit/AbstractDefinitionListRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/rende= rkit/AbstractDefinitionListRenderer.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/rende= rkit/AbstractDefinitionListRenderer.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -46,14 +46,14 @@ if(null !=3D dt){ writer.startElement("dt", dt); String rowClass =3D holder.getColumnClass(currentRow); - encodeStyleClass(writer, null, "dr-definition-term rich-definition-term= ", null, rowClass); + encodeStyleClass(writer, null, "rich-definition-term", null, rowClass); renderChild(context, dt); writer.endElement("dt"); = } writer.startElement("dd", table); getUtils().encodeId(context, table); String rowClass =3D holder.getRowClass(); - encodeStyleClass(writer, null, "dr-definition rich-definition", null, ro= wClass); + encodeStyleClass(writer, null, "rich-definition", null, rowClass); encodeRowEvents(context, table); renderChildren(context, table); writer.endElement("dd"); Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces= /renderkit/AbstractGridRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/rende= rkit/AbstractGridRenderer.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/rende= rkit/AbstractGridRenderer.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -44,7 +44,7 @@ if(header !=3D null ){ writer.startElement("thead", table); String headerClass =3D (String) table.getAttributes().get("hea= derClass"); - encodeTableHeaderFacet(context, table.getColumns(), writer, he= ader, "dr-table-header rich-table-header","dr-table-header-continue rich-ta= ble-header-continue", "dr-table-headercell rich-table-headercell", headerCl= ass, "th"); + encodeTableHeaderFacet(context, table.getColumns(), writer, he= ader, "rich-table-header","rich-table-header-continue", "rich-table-headerc= ell", headerClass, "th"); writer.endElement("thead"); } } @@ -55,7 +55,7 @@ if(footer !=3D null ){ writer.startElement("tfoot", table); String footerClass =3D (String) table.getAttributes().get("foo= terClass"); - encodeTableHeaderFacet(context, table.getColumns(), writer, fo= oter, "dr-table-footer rich-table-footer","dr-table-footer-continue rich-ta= ble-footer-continue", "dr-table-footercell rich-table-footercell", footerCl= ass, "td"); + encodeTableHeaderFacet(context, table.getColumns(), writer, fo= oter, "rich-table-footer","rich-table-footer-continue", "rich-table-footerc= ell", footerClass, "td"); writer.endElement("tfoot"); } = @@ -85,14 +85,14 @@ = writer.startElement(HTML.TR_ELEMENT, table); String rowClass =3D holder.getRowClass(gridRowCounter); - encodeStyleClass(writer, null, "dr-table-row rich-table-row", null, row= Class); + encodeStyleClass(writer, null, "rich-table-row", null, rowClass); encodeRowEvents(context, table); = } writer.startElement(HTML.td_ELEM, table); getUtils().encodeId(context, table); String columnClass =3D holder.getColumnClass(currentRow-gridRowCounter*c= ols); - encodeStyleClass(writer, null, "dr-table-cell rich-table-cell", null, co= lumnClass); + encodeStyleClass(writer, null, "rich-table-cell", null, columnClass); renderChildren(context, table); writer.endElement(HTML.td_ELEM); } @@ -114,7 +114,7 @@ for(int i =3D rest;i - + @@ -17,7 +17,7 @@ = - + @@ -32,7 +32,7 @@ = - + @@ -47,7 +47,7 @@ = - + @@ -56,11 +56,11 @@ = - + = - + @@ -77,18 +77,18 @@ = - + <= !--additionalBackgroundColor--> = - + = - + @@ -102,13 +102,13 @@ = - .dr-table-sortable-header { + .rich-table-sortable-header { background-position: right center; background-repeat: no-repeat; white-space : nowrap; } = - .dr-table-cursor-pointer { + .rich-table-cursor-pointer { cursor: pointer; } = @@ -116,21 +116,21 @@ cursor: default; } = - .dr-table-header-sort-img { + .rich-sort-icon { vertical-align: middle; } = - + = = = - + = = - + @@ -147,11 +147,11 @@ = - + = - + @@ -167,21 +167,21 @@ = - + = - + = - + <= !--additionalBackgroundColor--> = - + @@ -198,11 +198,11 @@ = = - + = - + Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/rich= faces/datatable/css/table.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= datatable/css/table.xcss 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= datatable/css/table.xcss 2009-05-22 16:36:40 UTC (rev 14286) @@ -3,13 +3,13 @@ xmlns:u=3D'http:/jsf.exadel.com/template/util' = xmlns=3D"http://www.w3.org/1999/xhtml" >
      Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/rich= faces/htmlDataGrid.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataGrid.jspx 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataGrid.jspx 2009-05-22 16:36:40 UTC (rev 14286) @@ -14,7 +14,7 @@ css/table.xcss Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/rich= faces/htmlDataList.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataList.jspx 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataList.jspx 2009-05-22 16:36:40 UTC (rev 14286) @@ -12,7 +12,7 @@ >
        Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/rich= faces/htmlDataOrderedList.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataOrderedList.jspx 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataOrderedList.jspx 2009-05-22 16:36:40 UTC (rev 14286) @@ -12,7 +12,7 @@ >
          Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/rich= faces/htmlDataTable.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataTable.jspx 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/= htmlDataTable.jspx 2009-05-22 16:36:40 UTC (rev 14286) @@ -15,7 +15,7 @@ css/table.xcss
      + class=3D"rich-table #{component.attributes['styleClass']}" style=3D"#= {component.attributes['style']}" > = Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /component/DataDefinitionListComponentsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataDefinitionListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 142= 85) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataDefinitionListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 142= 86) @@ -154,7 +154,7 @@ assertNotNull(dl); assertEquals("dl", dl.getNodeName()); String classAttr =3D dl.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-deflist rich-deflist")); + assertTrue(classAttr.contains("rich-deflist")); = List dds =3D dl.getHtmlElementsByTagName("dd"); assertTrue(dds.size() > 0); @@ -162,7 +162,7 @@ HtmlElement dd =3D (HtmlElement) dds.get(0); assertNotNull(dd); classAttr =3D dd.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-definition rich-definition")); + assertTrue(classAttr.contains("rich-definition")); } = /** @@ -187,7 +187,7 @@ assertNotNull(dl); assertEquals("dl", dl.getNodeName()); String classAttr =3D dl.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-deflist rich-deflist")); + assertTrue(classAttr.contains("rich-deflist")); = List dts =3D dl.getHtmlElementsByTagName("dt"); assertTrue(dts.size() > 0); @@ -196,7 +196,7 @@ assertNotNull(dt); classAttr =3D dt.getAttributeValue("class"); assertTrue(classAttr - .contains("dr-definition-term rich-definition-term")); + .contains("rich-definition-term")); = List dds =3D dl.getHtmlElementsByTagName("dd"); assertTrue(dds.size() > 0); @@ -204,7 +204,7 @@ HtmlElement dd =3D (HtmlElement) dds.get(0); assertNotNull(dd); classAttr =3D dd.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-definition rich-definition")); + assertTrue(classAttr.contains("rich-definition")); = Iterator fixedChildren =3D dataList.fixedChildren(); assertNotNull(fixedChildren); Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /component/DataGridComponentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataGridComponentTest.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataGridComponentTest.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -147,13 +147,13 @@ assertNotNull(table); assertEquals("table", table.getNodeName()); String classAttr =3D table.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table rich-table")); + assertTrue(classAttr.contains("rich-table")); = List captions =3D table.getHtmlElementsByTagName("caption"); assertNotNull(captions); assertEquals(1, captions.size()); classAttr =3D ((HtmlElement) captions.get(0)).getAttributeValue("c= lass"); - assertTrue(classAttr.contains("dr-table-caption rich-table-caption= ")); + assertTrue(classAttr.contains("rich-table-caption")); = List headers =3D table.getHtmlElementsByTagName("thead"); assertNotNull(headers); @@ -164,7 +164,7 @@ HtmlElement tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-header rich-table-header")= ); + assertTrue(classAttr.contains("rich-table-header")); = List tds =3D tr.getHtmlElementsByTagName("th"); assertTrue(tds.size() > 0); @@ -172,7 +172,7 @@ assertNotNull(td); classAttr =3D td.getAttributeValue("class"); assertTrue(classAttr - .contains("dr-table-headercell rich-table-headercell")); + .contains("rich-table-headercell")); = List footers =3D table.getHtmlElementsByTagName("tfoot"); assertNotNull(footers); @@ -182,7 +182,7 @@ tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-footer rich-table-footer")= ); + assertTrue(classAttr.contains("rich-table-footer")); = tds =3D tr.getHtmlElementsByTagName("td"); assertTrue(tds.size() > 0); @@ -190,7 +190,7 @@ assertNotNull(td); classAttr =3D td.getAttributeValue("class"); assertTrue(classAttr - .contains("dr-table-footercell rich-table-footercell")); + .contains("rich-table-footercell")); = List bodies =3D table.getHtmlElementsByTagName("tbody"); assertEquals(1, bodies.size()); @@ -199,7 +199,7 @@ tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-row rich-table-row")); + assertTrue(classAttr.contains("rich-table-row")); assertTrue(classAttr.contains("row1")); = tds =3D tr.getHtmlElementsByTagName("td"); @@ -207,7 +207,7 @@ td =3D (HtmlElement) tds.get(0); assertNotNull(td); classAttr =3D td.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-cell rich-table-cell")); + assertTrue(classAttr.contains("rich-table-cell")); assertTrue(classAttr.contains("A")); } = Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /component/DataListComponentsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -156,7 +156,7 @@ assertNotNull(ul); assertEquals("ul", ul.getNodeName()); String classAttr =3D ul.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-list rich-datalist")); + assertTrue(classAttr.contains("rich-datalist")); classAttr =3D ul.getAttributeValue("type"); = = @@ -166,7 +166,7 @@ HtmlElement li =3D (HtmlElement) lis.get(0); assertNotNull(li); classAttr =3D li.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-list-item rich-list-item")); + assertTrue(classAttr.contains("rich-list-item")); } = } Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /component/DataOrderedListComponentsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataOrderedListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/compo= nent/DataOrderedListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -156,7 +156,7 @@ assertNotNull(ol); assertEquals("ol", ol.getNodeName()); String classAttr =3D ol.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-list rich-orderedlist")); + assertTrue(classAttr.contains("rich-orderedlist")); classAttr =3D ol.getAttributeValue("type"); = List lis =3D ol.getHtmlElementsByTagName("li"); @@ -165,7 +165,7 @@ HtmlElement li =3D (HtmlElement) lis.get(0); assertNotNull(li); classAttr =3D li.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-list-item rich-list-item")); + assertTrue(classAttr.contains("rich-list-item")); } = } Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /renderkit/DataTableRenderingTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/rende= rkit/DataTableRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/rende= rkit/DataTableRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -214,7 +214,7 @@ assertNotNull(table); assertEquals("table", table.getNodeName()); String classAttr =3D table.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table rich-table")); + assertTrue(classAttr.contains("rich-table")); = List elements =3D table.getHtmlElementsByTagName("col"); assertEquals(2, elements.size()); @@ -230,7 +230,7 @@ HtmlElement tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-firstrow rich-table-firstr= ow")); + assertTrue(classAttr.contains("rich-table-firstrow")); classAttr =3D tr.getAttributeValue("onmouseover"); assertTrue(classAttr.contains("onRowMouseOver")); for (int i =3D 1; i < trs.size(); i++) { @@ -242,8 +242,6 @@ classAttr.contains("onRowMouseOver")); = classAttr =3D tr.getAttributeValue("class"); - assertFalse("Row i =3D " + i + " have 'dr-table-firstrow' styl= e", - classAttr.contains("dr-table-firstrow")); assertFalse("Row i =3D " + i + " have 'rich-table-firstrow' st= yle", = classAttr.contains("rich-table-firstrow")); } @@ -253,7 +251,7 @@ HtmlElement td =3D (HtmlElement) tds.next(); assertNotNull(td); classAttr =3D td.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-cell rich-table-cell")); + assertTrue(classAttr.contains("rich-table-cell")); } = /** @@ -309,7 +307,7 @@ assertEquals(1, captions.size()); String classAttr =3D ((HtmlElement) captions.get(0)) .getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-caption rich-table-caption= ")); + assertTrue(classAttr.contains("rich-table-caption")); = List headers =3D table.getHtmlElementsByTagName("thead"); assertNotNull(headers); @@ -319,7 +317,7 @@ HtmlElement tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-header rich-table-header")= ); + assertTrue(classAttr.contains("rich-table-header")); = Iterator tds =3D tr.getChildIterator(); assertNotNull(tds); @@ -327,7 +325,7 @@ HtmlElement td =3D (HtmlElement) tds.next(); assertNotNull(td); classAttr =3D td.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-headercell rich-table-head= ercell")); + assertTrue(classAttr.contains("rich-table-headercell")); assertTrue(classAttr.contains("cola")); = List footers =3D table.getHtmlElementsByTagName("tfoot"); @@ -338,14 +336,14 @@ tr =3D (HtmlElement) trs.get(0); assertNotNull(tr); classAttr =3D tr.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-footer rich-table-footer "= )); + assertTrue(classAttr.contains("rich-table-footer ")); = tds =3D tr.getChildIterator(); assertTrue(tds.hasNext()); td =3D (HtmlElement) tds.next(); assertNotNull(td); classAttr =3D td.getAttributeValue("class"); - assertTrue(classAttr.contains("dr-table-footercell rich-table-foot= ercell ")); + assertTrue(classAttr.contains("rich-table-footercell ")); = Iterator fixedChildren =3D dataTable.fixedChildren(); assertNotNull(fixedChildren); Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces= /renderkit/SortableHeaderRenderingTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/rende= rkit/SortableHeaderRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285) +++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/rende= rkit/SortableHeaderRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286) @@ -178,8 +178,7 @@ = String clazz =3D span.getAttributeValue(HTML.class_ATTRIBUTE); assertNotNull(clazz); - //assertTrue(clazz.contains("dr-table-header-sort-up")); - assertTrue(clazz.contains("dr-table-sortable-header")); + assertTrue(clazz.contains("rich-table-sortable-header")); = DomText text =3D (DomText) span.getFirstDomChild(); assertNotNull(text); --===============3620874294431118393==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 18:43:55 2009 Content-Type: multipart/mixed; boundary="===============0945165744323786607==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14287 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773 and 4 other directories. Date: Fri, 22 May 2009 18:37:17 -0400 Message-ID: --===============0945165744323786607== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-22 18:37:17 -0400 (Fri, 22 May 2009) New Revision: 14287 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf5773/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf5773/Test.java branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf5773.xhtml Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/resources/testng.xml Log: https://jira.jboss.org/jira/browse/RF-5773 Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java 20= 09-05-22 22:37:17 UTC (rev 14287) @@ -0,0 +1,57 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + + +package org.richfaces.regressionarea.issues.rf5773; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +/** + * This test case for: RF-5773 - = + * Forms not working within DataTable + * = + * @author Nick Belaevski + * @since 3.3.2 + */ + +(a)Name("rf5773") +(a)Scope(ScopeType.SESSION) +public class Bean { + + private List items; + + public Bean() { + items =3D new ArrayList(); + for (int i =3D 0; i < 3; i++) { + items.add(new Item("Item " + i)); + } + } + = + public List getItems() { + return items; + } + +} Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java 20= 09-05-22 22:37:17 UTC (rev 14287) @@ -0,0 +1,63 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +package org.richfaces.regressionarea.issues.rf5773; + +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski + * @since 3.3.2 + */ +public class Item { + + private String value; + + private int counter =3D 0; + = + public Item(String value) { + super(); + this.value =3D value; + } + = + public String getValue() { + return value; + } + = + public void setValue(String value) { + this.value =3D value; + } + = + public void incCounter() { + counter++; + } + = + public void validate(FacesContext context, UIComponent component, Object = value) { + String messageText =3D value.toString(); + context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, me= ssageText, messageText)); + } + = + public int getCounter() { + return counter; + } +} Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf5773/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf5773/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf5773/Test.java 2009-05-22 22:3= 7:17 UTC (rev 14287) @@ -0,0 +1,81 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + + +package org.richfaces.testng.rf5773; + +import junit.framework.Assert; + +import org.richfaces.SeleniumTestBase; + +/** + * @author Nick Belaevski + * @since 3.3.2 + */ +public class Test extends SeleniumTestBase { + + private void checkStep(String[] text, int[] counter) { + for (int i =3D 0; i < text.length; i++) { + String s =3D getTextById("outputRepeat:" + i + ":valuePanel"); + = + Assert.assertEquals( + String.format("Value check failed for step: [%d]; expected '%s' was '%= s'", i, text[i], s), + text[i], s); + } + + for (int i =3D 0; i < counter.length; i++) { + String s =3D getTextById("outputRepeat:" + i + ":counterPanel"); + Assert.assertEquals( + String.format("Counter check failed for step: [%d]; expected '%s' was = '%s'", i, counter[i], s), + String.valueOf(counter[i]), s); + } + } + = + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); + + String[] text =3D {"Item 0", "Item 1", "Item 2"}; + int[] counter =3D new int[text.length]; + + //check initial setup + checkStep(text, counter); + AssertTextEquals("messages", ""); + //initial setup ok + + for (int i =3D 0; i < text.length; i++) { + text[i] =3D "Val:" + String.valueOf(i) ; + counter[i]++; + type("formsRepeat:" + i + ":form:input", text[i]); + clickAjaxCommandAndWait("formsRepeat:" + i + ":form:link"); + = + checkStep(text, counter); + AssertTextEquals("messages", text[i]); + } + = + } + = + = + @Override + public String getTestUrl() { + return "pages/rf5773.xhtml"; + } +} Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-tests/src/test/resources/testng.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/resources/testng.xml 2009-05-22 16:36:40 UTC (rev 14286) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/resources/testng.xml 2009-05-22 22:37:17 UTC (rev 14287) @@ -31,6 +31,7 @@ + Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf5773.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf5773.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf5773.xhtml 2009-05-22 22:37:17 UTC (rev 14287) @@ -0,0 +1,36 @@ + + + = + + + + + + + + + + + + + + + + #{item.value} + = + + + #{item.counter} + = +
      = +       +       + +       +       + --===============0945165744323786607==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 18:57:18 2009 Content-Type: multipart/mixed; boundary="===============3251299857416793363==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14288 - branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component. Date: Fri, 22 May 2009 18:50:40 -0400 Message-ID: --===============3251299857416793363== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-22 18:50:40 -0400 (Fri, 22 May 2009) New Revision: 14288 Modified: branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UI= AjaxForm.java Log: https://jira.jboss.org/jira/browse/RF-5773 Modified: branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/compo= nent/UIAjaxForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/U= IAjaxForm.java 2009-05-22 22:37:17 UTC (rev 14287) +++ branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/U= IAjaxForm.java 2009-05-22 22:50:40 UTC (rev 14288) @@ -42,7 +42,7 @@ * @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:22 $ * */ -public abstract class UIAjaxForm extends UIForm implements AjaxComponent, = AjaxSource = +public abstract class UIAjaxForm extends UIForm implements AjaxComponent, = AjaxSource, IterationStateHolder = { public static final String COMPONENT_TYPE =3D "org.ajax4jsf.Form"; = @@ -171,4 +171,11 @@ = public abstract void setAjaxSubmit(boolean ajax); = + public Object getIterationState() { + return isSubmitted() ? Boolean.TRUE : Boolean.FALSE; + } + = + public void setIterationState(Object state) { + setSubmitted(Boolean.TRUE.equals(state)); + } } --===============3251299857416793363==-- From richfaces-svn-commits at lists.jboss.org Fri May 22 20:10:51 2009 Content-Type: multipart/mixed; boundary="===============7953159256121258258==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14289 - in branches/jsf2.0/cdk/generator: src/main/xsd and 1 other directory. Date: Fri, 22 May 2009 20:04:14 -0400 Message-ID: --===============7953159256121258258== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: alexsmirnov Date: 2009-05-22 20:04:14 -0400 (Fri, 22 May 2009) New Revision: 14289 Modified: branches/jsf2.0/cdk/generator/pom.xml branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd Log: Modified: branches/jsf2.0/cdk/generator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/pom.xml 2009-05-22 22:50:40 UTC (rev 1428= 8) +++ branches/jsf2.0/cdk/generator/pom.xml 2009-05-23 00:04:14 UTC (rev 1428= 9) @@ -22,6 +22,20 @@ 1.5 + + org.codehaus.mojo + jaxb2-maven-plugin + + + + xjc + + + + + org.richfaces.cdk.model + + Modified: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-22 22:50:40 = UTC (rev 14288) +++ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-23 00:04:14 = UTC (rev 14289) @@ -42,7 +42,11 @@ = - + + + + = --===============7953159256121258258==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 04:30:31 2009 Content-Type: multipart/mixed; boundary="===============5076870960153851762==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14290 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf7064 and 1 other directory. Date: Mon, 25 May 2009 04:23:23 -0400 Message-ID: --===============5076870960153851762== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:23:23 -0400 (Mon, 25 May 2009) New Revision: 14290 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7064/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7064/Test.java Log: RF-7064 test java bean Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf7064/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7064/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7064/Test.java 2009-05-25 08:2= 3:23 UTC (rev 14290) @@ -0,0 +1,27 @@ +package org.richfaces.testng.rf7064; + +import org.richfaces.SeleniumTestBase; + +public class Test extends SeleniumTestBase { + + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); + = + selenium.assignId("form:toogleModes:1", "textArea"); = + clickAjaxCommandAndWait("textArea"); = + = + clickAjaxCommandAndWait("form:useSeamText"); = + type("form:editorTextArea", "

      header

      "); + = + clickAjaxCommandAndWait("form:toogleModes:0"); = + = + AssertTextEquals("//*[@id=3D'tinymce']/h1", "header"); = + = + } + + @Override + public String getTestUrl() { + return "pages/rf7064.xhtml"; + } +} \ No newline at end of file --===============5076870960153851762==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 04:31:54 2009 Content-Type: multipart/mixed; boundary="===============7542798937028068050==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14291 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web. Date: Mon, 25 May 2009 04:24:47 -0400 Message-ID: --===============7542798937028068050== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:24:47 -0400 (Mon, 25 May 2009) New Revision: 14291 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/pom.xml Log: Add seam-ui dependency for RF-7064 testing. Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/pom.xml 2009-05-25 08:23:23 UTC (rev 14290) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/pom.xml 2009-05-25 08:24:47 UTC (rev 14291) @@ -59,6 +59,12 @@ ${jsfversion} provided + + javax.faces + jsf-impl + ${jsfversion} + provided + com.sun.facelets jsf-facelets @@ -111,7 +117,7 @@       = - regressionArea-web + regressionArea org.apache.maven.plugins --===============7542798937028068050==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 04:33:32 2009 Content-Type: multipart/mixed; boundary="===============8097258559182800639==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14292 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Mon, 25 May 2009 04:26:25 -0400 Message-ID: --===============8097258559182800639== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:26:25 -0400 (Mon, 25 May 2009) New Revision: 14292 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf7064.xhtml Log: RF-7064 page added. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf7064.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7064.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7064.xhtml 2009-05-25 08:26:25 UTC (rev 14292) @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file --===============8097258559182800639==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 04:33:52 2009 Content-Type: multipart/mixed; boundary="===============3771660426697027882==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14293 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb. Date: Mon, 25 May 2009 04:26:45 -0400 Message-ID: --===============3771660426697027882== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:26:44 -0400 (Mon, 25 May 2009) New Revision: 14293 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/pom.xml Log: Add seam-ui dependency Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-ejb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 08:26:25 UTC (rev 14292) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 08:26:44 UTC (rev 14293) @@ -27,8 +27,23 @@ jboss-seam ${seamversion} - = + org.jboss.seam + jboss-seam + ${seamversion} + + + org.jboss.seam + jboss-seam-ui + ${seamversion} + + + jboss-seam + org.jboss.seam + + = + = + log4j log4j 1.2.14 --===============3771660426697027882==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 04:35:14 2009 Content-Type: multipart/mixed; boundary="===============5843306568014281889==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14294 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main: java/org/richfaces/regressionarea/issues/rf7064 and 1 other directories. Date: Mon, 25 May 2009 04:28:06 -0400 Message-ID: --===============5843306568014281889== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:28:06 -0400 (Mon, 25 May 2009) New Revision: 14294 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.ja= va branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBea= n.java branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/resources/advanced.properties branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/resources/simple.properties Log: RF-7064 java bean and resources added. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBea= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.j= ava (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.j= ava 2009-05-25 08:28:06 UTC (rev 14294) @@ -0,0 +1,87 @@ +package org.richfaces.regressionarea.issues.rf7064; + +import java.util.ArrayList; +import java.util.List; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.model.SelectItem; +import javax.faces.validator.ValidatorException; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.ui.validator.FormattedTextValidator; + +(a)Name("editorBean") +(a)Scope(ScopeType.SESSION) +public class EditorBean { + + private String currentConfiguration =3D "simple"; + private String viewMode =3D "visual"; + private String value; + private boolean liveUpdatesEnabled=3Dfalse; + private boolean useSeamText=3Dfalse; + = +// private static final String CONFIGS_PACKAGE =3D "/org/richfaces/demo/ed= itor/"; + List configurations =3D new ArrayList(); + = + public EditorBean() { + configurations.add(new SelectItem("simple", "Simple")); + configurations.add(new SelectItem("advanced", "Advanced")); + } + = + public void resetValue() { + value =3D ""; + } + = + public String getCurrentConfiguration() { + return currentConfiguration; + } + + public void setCurrentConfiguration(String currentConfiguration) { + this.currentConfiguration =3D currentConfiguration; + } + + public List getConfigurations() { + return configurations; + } + + public String getViewMode() { + return viewMode; + } + + public void setViewMode(String viewMode) { + this.viewMode =3D viewMode; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value =3D value; + } + + public boolean isLiveUpdatesEnabled() { + return liveUpdatesEnabled; + } + + public void setLiveUpdatesEnabled(boolean liveUpdatesEnabled) { + this.liveUpdatesEnabled =3D liveUpdatesEnabled; + } + + public boolean isUseSeamText() { + return useSeamText; + } + + public void setUseSeamText(boolean useSeamText) { + this.useSeamText =3D useSeamText; + } + = + public void validate(FacesContext context, UIComponent component, Object = value) throws ValidatorException { + if (useSeamText) { + new FormattedTextValidator().validate(context, component, value); + } + } +} Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputRese= tBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBe= an.java (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBe= an.java 2009-05-25 08:28:06 UTC (rev 14294) @@ -0,0 +1,54 @@ +/** + * 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-130= 1 USA + */ + +package org.richfaces.regressionarea.issues.rf7064; + +import javax.faces.component.UIComponent; +import javax.faces.component.UIInput; +import javax.faces.context.FacesContext; +import javax.faces.event.ValueChangeEvent; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +/** + * @author Nick Belaevski + * @since 3.3.1 + */ +(a)Name("inputResetBean") +(a)Scope(ScopeType.EVENT) +public class InputResetBean { + + @In + private FacesContext facesContext; + = + public void processValueChange(ValueChangeEvent valueChangeEvent) { + if (facesContext.getMaximumSeverity() !=3D null) { + UIComponent component =3D valueChangeEvent.getComponent(); + if (component instanceof UIInput) { + UIInput input =3D (UIInput) component; + input.resetValue(); + } + } + } +} Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/resources/advanced.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/resources/advanced.properties (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/resources/advanced.properties 2009-05-25 08:28:06 UTC (rev 1= 4294) @@ -0,0 +1,5 @@ +theme=3D"advanced" +theme_advanced_toolbar_location=3D"top" +theme_advanced_toolbar_align=3D"left" +plugins=3D"preview,insertdatetime" +theme_advanced_buttons3=3D"hr,removeformat,visualaid,separator,sub,sup,sep= arator,charmap" Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/resources/simple.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/resources/simple.properties (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/resources/simple.properties 2009-05-25 08:28:06 UTC (rev 142= 94) @@ -0,0 +1 @@ +theme=3D"simple" --===============5843306568014281889==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 05:00:41 2009 Content-Type: multipart/mixed; boundary="===============8991513952262109748==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14295 - branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts. Date: Mon, 25 May 2009 04:53:34 -0400 Message-ID: --===============8991513952262109748== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ilya_shaikovsky Date: 2009-05-25 04:53:34 -0400 (Mon, 25 May 2009) New Revision: 14295 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/re= nderkit/html/scripts/combobox.js Log: https://jira.jboss.org/jira/browse/RF-7241 Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richf= aces/renderkit/html/scripts/combobox.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-25 08:28:06 UTC (rev 14294) +++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/r= enderkit/html/scripts/combobox.js 2009-05-25 08:53:34 UTC (rev 14295) @@ -371,7 +371,7 @@ = var value =3D jQuery(this.comboList.activeItem).text(); = - if((this.comboValue.value && (this.comboValue.value !=3D value)) { + if(this.comboValue.value && (this.comboValue.value !=3D value)) { Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value:= value}); } = = --===============8991513952262109748==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 05:01:25 2009 Content-Type: multipart/mixed; boundary="===============9089924421189167098==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14296 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf7172 and 1 other directory. Date: Mon, 25 May 2009 04:54:18 -0400 Message-ID: --===============9089924421189167098== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 04:54:17 -0400 (Mon, 25 May 2009) New Revision: 14296 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7064/Test.java branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf7172/Test.java Log: Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-tests/src/test/java/org/richfaces/testng/rf7064/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7064/Test.java 2009-05-25 08:5= 3:34 UTC (rev 14295) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7064/Test.java 2009-05-25 08:5= 4:17 UTC (rev 14296) @@ -16,7 +16,8 @@ = clickAjaxCommandAndWait("form:toogleModes:0"); = = - AssertTextEquals("//*[@id=3D'tinymce']/h1", "header"); = + selenium.assignId("//*[@id=3D'tinymce']/h1", "expected"); + AssertTextEquals("expected", "header", "expected:'header';actual:'" + ge= tTextById("expected") + "'"); = = } = Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-tests/src/test/java/org/richfaces/testng/rf7172/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7172/Test.java 2009-05-25 08:5= 3:34 UTC (rev 14295) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf7172/Test.java 2009-05-25 08:5= 4:17 UTC (rev 14296) @@ -19,7 +19,7 @@ = try { if (!str.equalsIgnoreCase("testValue")) - throw new AssertionError("params test failed."); + throw new AssertionError("params test failed. Actual value:" + str); } catch (Exception e) { System.err.println(e.getStackTrace()); } --===============9089924421189167098==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 05:12:03 2009 Content-Type: multipart/mixed; boundary="===============7840999931320179951==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14297 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt. Date: Mon, 25 May 2009 05:04:55 -0400 Message-ID: --===============7840999931320179951== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 05:04:55 -0400 (Mon, 25 May 2009) New Revision: 14297 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-co= mmon.xsl Log: https://jira.jboss.org/jira/browse/RF-7081 - all components were grouped = Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f= .xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2= 009-05-25 08:54:17 UTC (rev 14296) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2= 009-05-25 09:04:55 UTC (rev 14297) @@ -3,20 +3,21 @@ xmlns:javaee=3D"http://java.sun.com/xml/ns/javaee" xmlns:u=3D"http:/jsf.exadel.com/template/util" xmlns:f=3D'http:/jsf.exadel.com/template' - version=3D"1.0" exclude-result-prefixes=3D"javaee"> - + + = = - + = = @@ -53,29 +54,46 @@ = = - + - - + + = + = + + + + + + + + + + + = + + + + + + = + =
      - - - - - - - - - - + = - + + < @@ -97,7 +116,7 @@ = - + @@ -108,7 +127,8 @@ = - = + + =
      <xsl:value-of select=3D"$prefix" /> @@ -169,8 +189,9 @@ </tgroup> </table> </xsl:if--> + <xsl:choose> - <xsl:when test=3D"document(concat($lang, $separator, 'included', $sepa= rator, $prefix, '_', $tag_name, '.xml'))"> + <xsl:when test=3D"$prefixExistence"> <xsl:for-each select=3D"document(concat($lang, $separator,'included',= $separator, $prefix, '_', $tag_name, '.xml'))/*"> <xsl:copy-of select=3D"./*" /> </xsl:for-each> @@ -182,7 +203,7 @@ </xsl:otherwise> </xsl:choose> = - </section> +</xsl:result-document> = </xsl:template> -</xsl:transform> \ No newline at end of file +</xsl:transform> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/x= html-common.xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-c= ommon.xsl 2009-05-25 08:54:17 UTC (rev 14296) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-c= ommon.xsl 2009-05-25 09:04:55 UTC (rev 14297) @@ -12,8 +12,17 @@ <!--xsl:param name=3D"generate.toc" select=3D"'book toc'"/--> <xsl:param name=3D"toc.section.depth" select=3D"5"/> <xsl:param name=3D"use.id.as.filename" select=3D"1"/> + <xsl:param name=3D"generate.toc"> +book toc +chapter toc +sect1 toc +sect2 toc +sect3 toc +sect4 toc +sect5 toc +section toc +</xsl:param> = - = = <!-- From: xhtml/docbook.xsl @@ -123,45 +132,9 @@ <a id=3D"feedback-link" onclick=3D"showPopup('feedback-maincontainer');"> <img src=3D"images/feedback_logo.png" class=3D"feedback-images" onload= =3D"init('feedback-summary', 'feedback-description');"/> </a> - </div> - <!--div id=3D"feedback-maincontainer" style=3D"display:none"> - <div id=3D"feedback-header"> - Send your remarks, comments or wishes to doc team - </div> - <a href=3D"#" onclick=3D"feedbackClose();" id=3D"feedback-close"> - <img src=3D"images/close.png" class=3D"feedback-images" /> - </a> - <div id=3D"feedback-state"><xsl:text> </xsl:text></div> - <iframe id=3D'feedback-iFrame' name=3D"feedback-iFrame"><xsl:text> </xsl= :text></iframe> - <form id=3D"feedback-mailform" method=3D"post" action=3D"http://192.168.= 0.194:8090/feedbackRF/FeedbackRF" target=3D"feedback-iFrame"> - <div class=3D"feedback-textbox-div"> - Subject:<input type=3D"text" id=3D"subject" name=3D"subject" title=3D= "Enter the subject of your message" class=3D"feedback-textbox" /> - </div> - <div class=3D"feedback-textbox-div"> - <span style=3D"vertical-align: top;">Message:</span> - <textarea name=3D"emailContent" title=3D"Type here the text of your m= essage" id=3D"feedback-emailContent"><xsl:text> </xsl:text></textarea> - </div> - <div class=3D"feedback-textbox-div"> - Your name:<input type=3D"text" id=3D"senderName" name=3D"senderName" = title=3D"Enter your name" class=3D"feedback-textbox" /> - </div> - <div class=3D"feedback-textbox-div"> - Your email:<input type=3D"text" id=3D"from" name=3D"from" title=3D"En= ter your email address" class=3D"feedback-textbox" /> - </div> - <span class=3D"feedback-button-container"> - <input type=3D"submit" value=3D"Send Message" name=3D"submit" class=3D= "feedback-formbutton" title=3D"Send Message" /> - </span> - <span class=3D"feedback-button-container"> - <input type=3D"reset" value=3D"Clear All Fields" class=3D"feedback-for= mbutton" title=3D"Clear All Fields" /> - </span> - </form> - </div> - <div id=3D"feedback-wrapper"> - <a id=3D"feedback-link" onclick=3D"feedbackAppear();"> - <img src=3D"images/feedback_logo.png" class=3D"feedback-images" width= =3D"100px"/> - </a> - </div--> = - </xsl:template> - = + </div> = + </xsl:template> + = <xsl:template name=3D"header.navigation"> <xsl:param name=3D"prev" select=3D"/foo"/> <xsl:param name=3D"next" select=3D"/foo"/> @@ -172,11 +145,11 @@ <xsl:variable name=3D"row2" select=3D"count($prev) > 0 or (count($up) = > 0 and generate-id($up) !=3D generate-id($home) and $navig.showtitles != =3D 0) or count($next) > 0"/> <xsl:if test=3D"$suppress.navigation =3D '0' and $suppress.header.navigat= ion =3D '0'"> <xsl:if test=3D"$row1 or $row2"> - <xsl:if test=3D"$row1"> + <xsl:if test=3D"$row1"> <xsl:if test=3D"$nightly > 0"> <div id=3D"overlay"> <xsl:text> </xsl:text> - </div> + </div> </xsl:if> <!-- FEEDBACK --> <xsl:call-template name=3D"feedback" /> @@ -335,52 +308,52 @@ and $generate.legalnotice.link !=3D 0">1</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> -</xsl:template> - - - -<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --> - -<xsl:template name=3D"navig.content"> - <xsl:param name=3D"direction" select=3D"next"/> - <xsl:variable name=3D"navtext"> - <xsl:choose> - <xsl:when test=3D"$direction =3D 'prev'"> - <xsl:call-template name=3D"gentext.nav.prev"/> - </xsl:when> - <xsl:when test=3D"$direction =3D 'next'"> - <xsl:call-template name=3D"gentext.nav.next"/> - </xsl:when> - <xsl:when test=3D"$direction =3D 'up'"> - <xsl:call-template name=3D"gentext.nav.up"/> - </xsl:when> - <xsl:when test=3D"$direction =3D 'home'"> - <xsl:call-template name=3D"gentext.nav.home"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>xxx</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test=3D"$navig.graphics !=3D 0"> - <img> - <xsl:attribute name=3D"src"> - <xsl:value-of select=3D"$navig.graphics.path"/> - <xsl:value-of select=3D"$direction"/> - <xsl:value-of select=3D"$navig.graphics.extension"/> - </xsl:attribute> - <xsl:attribute name=3D"alt"> - <xsl:value-of select=3D"$navtext"/> - </xsl:attribute> - </img> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select=3D"$navtext"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --> +</xsl:template> + + + +<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --> + +<xsl:template name=3D"navig.content"> + <xsl:param name=3D"direction" select=3D"next"/> + <xsl:variable name=3D"navtext"> + <xsl:choose> + <xsl:when test=3D"$direction =3D 'prev'"> + <xsl:call-template name=3D"gentext.nav.prev"/> + </xsl:when> + <xsl:when test=3D"$direction =3D 'next'"> + <xsl:call-template name=3D"gentext.nav.next"/> + </xsl:when> + <xsl:when test=3D"$direction =3D 'up'"> + <xsl:call-template name=3D"gentext.nav.up"/> + </xsl:when> + <xsl:when test=3D"$direction =3D 'home'"> + <xsl:call-template name=3D"gentext.nav.home"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>xxx</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test=3D"$navig.graphics !=3D 0"> + <img> + <xsl:attribute name=3D"src"> + <xsl:value-of select=3D"$navig.graphics.path"/> + <xsl:value-of select=3D"$direction"/> + <xsl:value-of select=3D"$navig.graphics.extension"/> + </xsl:attribute> + <xsl:attribute name=3D"alt"> + <xsl:value-of select=3D"$navtext"/> + </xsl:attribute> + </img> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select=3D"$navtext"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --> </xsl:stylesheet> --===============7840999931320179951==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 05:12:19 2009 Content-Type: multipart/mixed; boundary="===============2924712421583467374==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14298 - in branches/community/3.3.X/docs/userguide: en/src/main/docbook and 1 other directory. Date: Mon, 25 May 2009 05:05:12 -0400 Message-ID: <E1M8W7M-0006is-8V@committer01.frg.pub.inap.atl.jboss.com> --===============2924712421583467374== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 05:05:12 -0400 (Mon, 25 May 2009) New Revision: 14298 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml branches/community/3.3.X/docs/userguide/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7081 - all components were grouped = Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/maste= r.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 09:04:55 UTC (rev 14297) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 09:05:12 UTC (rev 14298) @@ -59,8 +59,124 @@ <!ENTITY beanValidator_table SYSTEM "../../../target/generated/beanValida= tor.xml"> <!ENTITY editor_table SYSTEM "../../../target/generated/editor.xml"> <!ENTITY colorPicker_table SYSTEM "../../../target/generated/colorPicker.= xml"> - <!ENTITY layout_table SYSTEM "../../../target/generated/layout.xml"> - = + <!ENTITY layout_table SYSTEM "../../../target/generated/layout.xml"> + = + <!-- NEW ENTITIES --> + <!ENTITY a4j_actionparam SYSTEM "../../../target/generated/a4j_actionpara= m.xml"> + <!ENTITY a4j_form SYSTEM "../../../target/generated/a4j_form.xml"> + <!ENTITY a4j_region SYSTEM "../../../target/generated/a4j_region.xml"> + <!ENTITY a4j_support SYSTEM "../../../target/generated/a4j_support.xml"> + <!ENTITY a4j_commandButton SYSTEM "../../../target/generated/a4j_commandB= utton.xml"> + <!ENTITY a4j_commandLink SYSTEM "../../../target/generated/a4j_commandLin= k.xml"> + <!ENTITY a4j_jsFunction SYSTEM "../../../target/generated/a4j_jsFunction.= xml"> + <!ENTITY a4j_poll SYSTEM "../../../target/generated/a4j_poll.xml"> + <!ENTITY a4j_push SYSTEM "../../../target/generated/a4j_push.xml"> + <!ENTITY a4j_queue SYSTEM "../../../target/generated/a4j_queue.xml"> + <!ENTITY a4j_status SYSTEM "../../../target/generated/a4j_status.xml"> + <!ENTITY a4j_ajaxListener SYSTEM "../../../target/generated/a4j_ajaxListe= ner.xml"> + + <!ENTITY a4j_loadBundle SYSTEM "../../../target/generated/a4j_loadBundle.= xml"> + <!ENTITY a4j_loadScript SYSTEM "../../../target/generated/a4j_loadScript.= xml"> + <!ENTITY a4j_loadStyle SYSTEM "../../../target/generated/a4j_loadStyle.xm= l"> + <!ENTITY a4j_keepAlive SYSTEM "../../../target/generated/a4j_keepAlive.xm= l"> + + <!ENTITY rich_ajaxValidator SYSTEM "../../../target/generated/rich_ajaxVa= lidator.xml"> + <!ENTITY rich_beanValidator SYSTEM "../../../target/generated/rich_beanVa= lidator.xml"> + <!ENTITY rich_graphValidator SYSTEM "../../../target/generated/rich_graph= Validator.xml"> + + <!ENTITY a4j_mediaOutput SYSTEM "../../../target/generated/a4j_mediaOutpu= t.xml"> + <!ENTITY a4j_include SYSTEM "../../../target/generated/a4j_include.xml"> + <!ENTITY a4j_outputPanel SYSTEM "../../../target/generated/a4j_outputPane= l.xml"> + = + <!ENTITY a4j_page SYSTEM "../../../target/generated/a4j_page.xml"> + <!ENTITY a4j_portlet SYSTEM "../../../target/generated/a4j_portlet.xml"> + <!ENTITY a4j_htmlCommandLink SYSTEM "../../../target/generated/a4j_htmlCo= mmandLink.xml"> + <!ENTITY a4j_log SYSTEM "../../../target/generated/a4j_log.xml"> + + <!ENTITY rich_column SYSTEM "../../../target/generated/rich_column.xml"> = + <!ENTITY rich_columnGroup SYSTEM "../../../target/generated/rich_columnGr= oup.xml"> + <!ENTITY rich_columns SYSTEM "../../../target/generated/rich_columns.xml"> + <!ENTITY rich_dataDefinitionList SYSTEM "../../../target/generated/rich_d= ataDefinitionList.xml"> + <!ENTITY rich_dataFilterSlider SYSTEM "../../../target/generated/rich_dat= aFilterSlider.xml"> + <!ENTITY rich_dataGrid SYSTEM "../../../target/generated/rich_dataGrid.xm= l"> + <!ENTITY rich_dataList SYSTEM "../../../target/generated/rich_dataList.xm= l"> + <!ENTITY rich_dataOrderedList SYSTEM "../../../target/generated/rich_data= OrderedList.xml"> + <!ENTITY rich_datascroller SYSTEM "../../../target/generated/rich_datascr= oller.xml"> + <!ENTITY rich_dataTable SYSTEM "../../../target/generated/rich_dataTable.= xml"> + <!ENTITY rich_subTable SYSTEM "../../../target/generated/rich_subTable.xm= l"> + <!ENTITY rich_extendedDataTable SYSTEM "../../../target/generated/rich_ex= tendedDataTable.xml"> + <!ENTITY a4j_repeat SYSTEM "../../../target/generated/a4j_repeat.xml"> + <!ENTITY rich_scrollableDataTable SYSTEM "../../../target/generated/rich_= scrollableDataTable.xml"> + + <!ENTITY rich_dragIndicator SYSTEM "../../../target/generated/rich_dragIn= dicator.xml"> + <!ENTITY rich_dragSupport SYSTEM "../../../target/generated/rich_dragSupp= ort.xml"> + <!ENTITY rich_dndParam SYSTEM "../../../target/generated/rich_dndParam.xm= l"> + <!ENTITY rich_dropSupport SYSTEM "../../../target/generated/rich_dropSupp= ort.xml"> + <!ENTITY rich_dropListener SYSTEM "../../../target/generated/rich_dropLis= tener.xml"> + <!ENTITY rich_dragListener SYSTEM "../../../target/generated/rich_dragLis= tener.xml"> + + <!ENTITY rich_contextMenu SYSTEM "../../../target/generated/rich_contextM= enu.xml"> + <!ENTITY rich_dropDownMenu SYSTEM "../../../target/generated/rich_dropDow= nMenu.xml"> + <!ENTITY rich_menuGroup SYSTEM "../../../target/generated/rich_menuGroup.= xml"> + <!ENTITY rich_menuItem SYSTEM "../../../target/generated/rich_menuItem.xm= l"> + <!ENTITY rich_menuSeparator SYSTEM "../../../target/generated/rich_menuSe= parator.xml"> + + <!ENTITY rich_recursiveTreeNodesAdaptor SYSTEM "../../../target/generated= /rich_recursiveTreeNodesAdaptor.xml"> + <!ENTITY rich_tree SYSTEM "../../../target/generated/rich_tree.xml"> + <!ENTITY rich_treeNode SYSTEM "../../../target/generated/rich_treeNode.xm= l"> + <!ENTITY rich_treeNodesAdaptor SYSTEM "../../../target/generated/rich_tre= eNodesAdaptor.xml"> + <!ENTITY rich_changeExpandListener SYSTEM "../../../target/generated/rich= _changeExpandListener.xml"> + <!ENTITY rich_nodeSelectListener SYSTEM "../../../target/generated/rich_n= odeSelectListener.xml"> + = + <!ENTITY rich_modalPanel SYSTEM "../../../target/generated/rich_modalPane= l.xml"> + <!ENTITY rich_paint2D SYSTEM "../../../target/generated/rich_paint2D.xml"> + <!ENTITY rich_panel SYSTEM "../../../target/generated/rich_panel.xml"> + <!ENTITY rich_panelBar SYSTEM "../../../target/generated/rich_panelBar.xm= l"> + <!ENTITY rich_panelBarItem SYSTEM "../../../target/generated/rich_panelBa= rItem.xml"> + <!ENTITY rich_panelMenu SYSTEM "../../../target/generated/rich_panelMenu.= xml"> + <!ENTITY rich_panelMenuItem SYSTEM "../../../target/generated/rich_panelM= enuItem.xml"> + <!ENTITY rich_panelMenuGroup SYSTEM "../../../target/generated/rich_panel= MenuGroup.xml"> + <!ENTITY rich_progressBar SYSTEM "../../../target/generated/rich_progress= Bar.xml"> + <!ENTITY rich_separator SYSTEM "../../../target/generated/rich_separator.= xml"> + <!ENTITY rich_simpleTogglePanel SYSTEM "../../../target/generated/rich_si= mpleTogglePanel.xml"> + <!ENTITY rich_spacer SYSTEM "../../../target/generated/rich_spacer.xml"> = + <!ENTITY rich_tabPanel SYSTEM "../../../target/generated/rich_tabPanel.xm= l"> = + <!ENTITY rich_tab SYSTEM "../../../target/generated/rich_tab.xml"> = + <!ENTITY rich_togglePanel SYSTEM "../../../target/generated/rich_togglePa= nel.xml"> = + <!ENTITY rich_toggleControl SYSTEM "../../../target/generated/rich_toggle= Control.xml"> = + <!ENTITY rich_toolBar SYSTEM "../../../target/generated/rich_toolBar.xml"= > = + <!ENTITY rich_toolBarGroup SYSTEM "../../../target/generated/rich_toolBar= Group.xml"> = + <!ENTITY rich_toolTip SYSTEM "../../../target/generated/rich_toolTip.xml"= > = + + <!ENTITY rich_calendar SYSTEM "../../../target/generated/rich_calendar.xm= l"> + <!ENTITY rich_colorPicker SYSTEM "../../../target/generated/rich_colorPic= ker.xml"> + <!ENTITY rich_comboBox SYSTEM "../../../target/generated/rich_comboBox.xm= l"> + <!ENTITY rich_editor SYSTEM "../../../target/generated/rich_editor.xml"> + <!ENTITY rich_fileUpload SYSTEM "../../../target/generated/rich_fileUploa= d.xml"> + <!ENTITY rich_inplaceInput SYSTEM "../../../target/generated/rich_inplace= Input.xml"> + <!ENTITY rich_inplaceSelect SYSTEM "../../../target/generated/rich_inplac= eSelect.xml"> + <!ENTITY rich_inputNumberSlider SYSTEM "../../../target/generated/rich_in= putNumberSlider.xml"> + <!ENTITY rich_inputNumberSpinner SYSTEM "../../../target/generated/rich_i= nputNumberSpinner.xml"> + <!ENTITY rich_suggestionbox SYSTEM "../../../target/generated/rich_sugges= tionbox.xml"> + + <!ENTITY rich_listShuttle SYSTEM "../../../target/generated/rich_listShut= tle.xml"> + <!ENTITY rich_orderingList SYSTEM "../../../target/generated/rich_orderin= gList.xml"> + <!ENTITY rich_pickList SYSTEM "../../../target/generated/rich_pickList.xm= l"> + = + <!ENTITY rich_page SYSTEM "../../../target/generated/rich_page.xml"> + <!ENTITY rich_layout SYSTEM "../../../target/generated/rich_layout.xml"> + <!ENTITY rich_layoutPanel SYSTEM "../../../target/generated/rich_layoutPa= nel.xml"> + = + = + <!ENTITY rich_componentControl SYSTEM "../../../target/generated/rich_com= ponentControl.xml"> + <!ENTITY rich_effect SYSTEM "../../../target/generated/rich_effect.xml"> + <!ENTITY rich_gmap SYSTEM "../../../target/generated/rich_gmap.xml"> + <!ENTITY rich_virtualEarth SYSTEM "../../../target/generated/rich_virtual= Earth.xml"> + <!ENTITY rich_hotKey SYSTEM "../../../target/generated/rich_hotKey.xml"> + <!ENTITY rich_insert SYSTEM "../../../target/generated/rich_insert.xml"> + <!ENTITY rich_message SYSTEM "../../../target/generated/rich_message.xml"> + <!ENTITY rich_messages SYSTEM "../../../target/generated/rich_messages.xm= l"> + <!ENTITY rich_jQuery SYSTEM "../../../target/generated/rich_jQuery.xml"> = ]> <book> <bookinfo> @@ -101,18 +217,185 @@ &rfcarchitectover; = <chapter role=3D"NotInToc" id=3D"RichFacesComponentsLibrary" xreflabel=3D"= RichFacesComponentsLibrary"> - <?dbhtml filename=3D"RichFacesComponentsLibrary.html"?> - = - <title>The RichFaces Components - The library encompasses ready-made components built based on the <= emphasis> - Rich Faces CDK - - . - - - = + + The RichFaces Components + + The library encompasses ready-made components built based on = + the Rich Faces CDK. + + +
      + + Ajax Support + + &a4j_ajaxListener; + &a4j_actionparam; + &a4j_form; + &a4j_region; + &a4j_support; + &a4j_commandButton; + &a4j_commandLink; + &a4j_jsFunction; + &a4j_poll; + &a4j_push; + &a4j_queue; + &a4j_status; +
      +
      + + Resources/Beans Handling + + &a4j_loadBundle; + &a4j_keepAlive; + &a4j_loadScript; + &a4j_loadStyle; +
      +
      + + Ajax Validators + + &rich_ajaxValidator; + &rich_beanValidator; + &rich_graphValidator; +
      +
      + + Ajax Output + + &a4j_include; + &a4j_mediaOutput; + &a4j_outputPanel; +
      +
      + + Ajax Miscellaneous + + &a4j_page; + &a4j_portlet; + &a4j_htmlCommandLink; + &a4j_log; +
      +
      + + Data Iteration + + &rich_column; + &rich_columnGroup; + &rich_columns; + &rich_dataDefinitionList; + &rich_dataFilterSlider; + &rich_dataGrid; + &rich_dataList; + &rich_dataOrderedList; + &rich_datascroller; + &rich_dataTable; + &rich_subTable; + &rich_extendedDataTable; + &a4j_repeat; + &rich_scrollableDataTable; +
      +
      + + Drag-Drop Support + + &rich_dragIndicator; + &rich_dragSupport; + &rich_dragListener; + &rich_dropListener; + &rich_dropSupport; + &rich_dndParam; +
      +
      + + Rich Menu + + &rich_contextMenu; + &rich_dropDownMenu; + &rich_menuGroup; + &rich_menuItem; + &rich_menuSeparator; +
      +
      + + Rich Trees + + &rich_tree; + &rich_treeNode; + &rich_treeNodesAdaptor; + &rich_recursiveTreeNodesAdaptor; + &rich_changeExpandListener; + &rich_nodeSelectListener; +
      +
      + + Rich Output + + &rich_modalPanel; + &rich_paint2D; + &rich_panel; + &rich_panelBar; + &rich_panelBarItem; + &rich_panelMenu; + &rich_panelMenuGroup; + &rich_panelMenuItem; + &rich_progressBar; + &rich_separator; + &rich_simpleTogglePanel; + &rich_spacer; + &rich_tabPanel; + &rich_tab; + &rich_togglePanel; + &rich_toggleControl; + &rich_toolBar; + &rich_toolBarGroup; + &rich_toolTip; +
      +
      + + Rich Input + + &rich_calendar; + &rich_colorPicker; + &rich_comboBox; + &rich_editor; + &rich_fileUpload; + &rich_inplaceInput; + &rich_inplaceSelect; + &rich_inputNumberSlider; + &rich_inputNumberSpinner; + &rich_suggestionbox; +
      +
      + + Rich Selects + + &rich_listShuttle; + &rich_orderingList; + &rich_pickList; +
      +
      + + Rich Semantic Layouts + + &rich_page; + &rich_layout; + &rich_layoutPanel; +
      +
      + + Rich Miscellaneous + + &rich_componentControl; + &rich_effect; + &rich_gmap; + &rich_virtualEarth; + &rich_hotKey; + &rich_insert; + &rich_message; + &rich_messages; + &rich_jQuery; +
      = + = &rfcidesupport; Modified: branches/community/3.3.X/docs/userguide/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/pom.xml 2009-05-25 09:04:55 UTC= (rev 14297) +++ branches/community/3.3.X/docs/userguide/pom.xml 2009-05-25 09:05:12 UTC= (rev 14298) @@ -757,6 +757,10 @@ xcssPath ..${file.separator}..${file.separator}generated${file.sep= arator}xcss + + + outputDir + ${project.build.directory}${file.separator}generated${fil= e.separator} @@ -805,6 +809,10 @@ xcssPath ..${file.separator}..${file.separator}generated${file.sep= arator}xcss + + + outputDir + ${project.build.directory}${file.separator}generated${fil= e.separator} --===============2924712421583467374==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 05:13:00 2009 Content-Type: multipart/mixed; boundary="===============8548343181531944434==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14299 - branches/community/3.3.X/docs/userguide/en/src/main/docbook. Date: Mon, 25 May 2009 05:05:53 -0400 Message-ID: --===============8548343181531944434== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 05:05:53 -0400 (Mon, 25 May 2009) New Revision: 14299 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml Log: https://jira.jboss.org/jira/browse/RF-7081 - all components were grouped = Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/maste= r.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 09:05:12 UTC (rev 14298) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 09:05:53 UTC (rev 14299) @@ -1,67 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - + @@ -394,59 +334,7 @@ &rich_message; &rich_messages; &rich_jQuery; - = - + = &rfcidesupport; --===============8548343181531944434==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 06:52:58 2009 Content-Type: multipart/mixed; boundary="===============8387975846080006667==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14300 - branches/community/3.3.X/docs/userguide/en/src/main/docbook. Date: Mon, 25 May 2009 06:45:45 -0400 Message-ID: --===============8387975846080006667== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 06:45:42 -0400 (Mon, 25 May 2009) New Revision: 14300 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml Log: https://jira.jboss.org/jira/browse/RF-7081 - all components were grouped = Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/maste= r.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 09:05:53 UTC (rev 14299) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-25 10:45:42 UTC (rev 14300) @@ -1,7 +1,16 @@ + + + + + + = + + + = @@ -334,7 +343,7 @@ &rich_message; &rich_messages; &rich_jQuery; - + = = &rfcidesupport; --===============8387975846080006667==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 07:55:09 2009 Content-Type: multipart/mixed; boundary="===============7637765201271152476==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14301 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt. Date: Mon, 25 May 2009 07:48:00 -0400 Message-ID: --===============7637765201271152476== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 07:47:59 -0400 (Mon, 25 May 2009) New Revision: 14301 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-co= mmon.xsl Log: https://jira.jboss.org/jira/browse/RF-7081 - TOC customization Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/x= html-common.xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-c= ommon.xsl 2009-05-25 10:45:42 UTC (rev 14300) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-c= ommon.xsl 2009-05-25 11:47:59 UTC (rev 14301) @@ -10,7 +10,9 @@ = - + + + = book toc @@ -29,7 +31,7 @@ Reason: Remove inline style for draft mode Version: 1.72.0 --> - = + --===============7637765201271152476==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 09:35:08 2009 Content-Type: multipart/mixed; boundary="===============0049002209931361557==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14302 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web. Date: Mon, 25 May 2009 09:27:58 -0400 Message-ID: --===============0049002209931361557== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 09:27:58 -0400 (Mon, 25 May 2009) New Revision: 14302 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/pom.xml Log: revert to previous revision Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/pom.xml 2009-05-25 11:47:59 UTC (rev 14301) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/pom.xml 2009-05-25 13:27:58 UTC (rev 14302) @@ -59,12 +59,6 @@ ${jsfversion} provided - - javax.faces - jsf-impl - ${jsfversion} - provided - com.sun.facelets jsf-facelets @@ -117,7 +111,7 @@ = - regressionArea + regressionArea-web org.apache.maven.plugins --===============0049002209931361557==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 09:36:33 2009 Content-Type: multipart/mixed; boundary="===============6420015969843360212==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14303 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb. Date: Mon, 25 May 2009 09:29:23 -0400 Message-ID: --===============6420015969843360212== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 09:29:23 -0400 (Mon, 25 May 2009) New Revision: 14303 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/pom.xml Log: revert to previous revision. Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-ejb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 13:27:58 UTC (rev 14302) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 13:29:23 UTC (rev 14303) @@ -4,7 +4,7 @@ org.richfaces.test-applications regressionArea - 3.3.2-SNAPSHOT + 3.3.1-SNAPSHOT org.richfaces.test-applications.regressionArea regressionArea-ejb @@ -27,23 +27,8 @@ jboss-seam ${seamversion} + = - org.jboss.seam - jboss-seam - ${seamversion} - - - org.jboss.seam - jboss-seam-ui - ${seamversion} - - - jboss-seam - org.jboss.seam - - = - = - log4j log4j 1.2.14 --===============6420015969843360212==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 09:56:03 2009 Content-Type: multipart/mixed; boundary="===============4428155736179803699==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14304 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb. Date: Mon, 25 May 2009 09:48:52 -0400 Message-ID: --===============4428155736179803699== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 09:48:52 -0400 (Mon, 25 May 2009) New Revision: 14304 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/pom.xml Log: rf version corrected:3.2.2-snapshot Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-ejb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 13:29:23 UTC (rev 14303) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/pom.xml 2009-05-25 13:48:52 UTC (rev 14304) @@ -4,7 +4,7 @@ org.richfaces.test-applications regressionArea - 3.3.1-SNAPSHOT + 3.3.2-SNAPSHOT org.richfaces.test-applications.regressionArea regressionArea-ejb --===============4428155736179803699==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 10:00:44 2009 Content-Type: multipart/mixed; boundary="===============0679813332419672340==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14305 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Mon, 25 May 2009 09:53:34 -0400 Message-ID: --===============0679813332419672340== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 09:53:34 -0400 (Mon, 25 May 2009) New Revision: 14305 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf7064.xhtml Log: remove validate Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-web/src/main/webapp/pages/rf7064.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7064.xhtml 2009-05-25 13:48:52 UTC (rev 14304) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf7064.xhtml 2009-05-25 13:53:34 UTC (rev 14305) @@ -12,8 +12,7 @@ --===============4153601138146394442== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 09:57:52 -0400 (Mon, 25 May 2009) New Revision: 14306 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.ja= va Log: remove validate method Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/Editor= Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.j= ava 2009-05-25 13:53:34 UTC (rev 14305) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.j= ava 2009-05-25 13:57:52 UTC (rev 14306) @@ -3,15 +3,11 @@ import java.util.ArrayList; import java.util.List; = -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; -import javax.faces.validator.ValidatorException; = import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.ui.validator.FormattedTextValidator; = @Name("editorBean") @Scope(ScopeType.SESSION) @@ -77,11 +73,6 @@ = public void setUseSeamText(boolean useSeamText) { this.useSeamText =3D useSeamText; - } + } = = - public void validate(FacesContext context, UIComponent component, Object = value) throws ValidatorException { - if (useSeamText) { - new FormattedTextValidator().validate(context, component, value); - } - } } --===============4153601138146394442==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 10:07:39 2009 Content-Type: multipart/mixed; boundary="===============3050833575368241528==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14307 - branches/community/3.3.X/test-applications/seamApp/web/src/main/java/org/richfaces/helloworld/domain/validator. Date: Mon, 25 May 2009 10:00:29 -0400 Message-ID: --===============3050833575368241528== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: adubovsky Date: 2009-05-25 10:00:29 -0400 (Mon, 25 May 2009) New Revision: 14307 Modified: branches/community/3.3.X/test-applications/seamApp/web/src/main/java/org= /richfaces/helloworld/domain/validator/ValidatorBean.java Log: Change UIBeanValidator to UIComponent Modified: branches/community/3.3.X/test-applications/seamApp/web/src/main/j= ava/org/richfaces/helloworld/domain/validator/ValidatorBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/seamApp/web/src/main/java/or= g/richfaces/helloworld/domain/validator/ValidatorBean.java 2009-05-25 13:57= :52 UTC (rev 14306) +++ branches/community/3.3.X/test-applications/seamApp/web/src/main/java/or= g/richfaces/helloworld/domain/validator/ValidatorBean.java 2009-05-25 14:00= :29 UTC (rev 14307) @@ -17,7 +17,6 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.richfaces.component.UIBeanValidator; import org.richfaces.helloworld.domain.util.componentInfo.ComponentInfo; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -42,7 +41,7 @@ @Size(min=3D1,max=3D5,message=3D"Size validation failed!") private ArrayList sizeValues; private String sizeValue; - private UIBeanValidator ajaxValidatorComponent =3D null; + private UIComponent ajaxValidatorComponent =3D null; private boolean ajaxSingle; private String bindLabel; private boolean disableDefault; @@ -198,11 +197,11 @@ return null; } = = - public UIBeanValidator getAjaxValidatorComponent() { + public UIComponent getAjaxValidatorComponent() { return ajaxValidatorComponent; } = - public void setAjaxValidatorComponent(UIBeanValidator ajaxValidatorCompon= ent) { + public void setAjaxValidatorComponent(UIComponent ajaxValidatorComponent)= { this.ajaxValidatorComponent =3D ajaxValidatorComponent; } = --===============3050833575368241528==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 10:07:52 2009 Content-Type: multipart/mixed; boundary="===============8879029364729410035==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14308 - branches/community/3.3.X/test-applications/facelets/src/main/java/validator. Date: Mon, 25 May 2009 10:00:41 -0400 Message-ID: --===============8879029364729410035== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: adubovsky Date: 2009-05-25 10:00:38 -0400 (Mon, 25 May 2009) New Revision: 14308 Modified: branches/community/3.3.X/test-applications/facelets/src/main/java/valida= tor/ValidatorBean.java Log: Change UIBeanValidator to UIComponent Modified: branches/community/3.3.X/test-applications/facelets/src/main/java= /validator/ValidatorBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/facelets/src/main/java/valid= ator/ValidatorBean.java 2009-05-25 14:00:29 UTC (rev 14307) +++ branches/community/3.3.X/test-applications/facelets/src/main/java/valid= ator/ValidatorBean.java 2009-05-25 14:00:38 UTC (rev 14308) @@ -14,7 +14,6 @@ import org.hibernate.validator.Pattern; import org.hibernate.validator.Range; import org.hibernate.validator.Size; -import org.richfaces.component.UIBeanValidator; import util.componentInfo.ComponentInfo; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -38,7 +37,7 @@ @Size(min=3D1,max=3D5,message=3D"Size validation failed!") private ArrayList sizeValues; private String sizeValue; - private UIBeanValidator ajaxValidatorComponent =3D null; + private UIComponent ajaxValidatorComponent =3D null; private boolean ajaxSingle; private String bindLabel; private boolean disableDefault; @@ -194,11 +193,11 @@ return null; } = = - public UIBeanValidator getAjaxValidatorComponent() { + public UIComponent getAjaxValidatorComponent() { return ajaxValidatorComponent; } = - public void setAjaxValidatorComponent(UIBeanValidator ajaxValidatorCompon= ent) { + public void setAjaxValidatorComponent(UIComponent ajaxValidatorComponent)= { this.ajaxValidatorComponent =3D ajaxValidatorComponent; } = --===============8879029364729410035==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 10:07:56 2009 Content-Type: multipart/mixed; boundary="===============8367637016790296214==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14309 - branches/community/3.3.X/test-applications/jsp/src/main/java/validator. Date: Mon, 25 May 2009 10:00:46 -0400 Message-ID: --===============8367637016790296214== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: adubovsky Date: 2009-05-25 10:00:46 -0400 (Mon, 25 May 2009) New Revision: 14309 Modified: branches/community/3.3.X/test-applications/jsp/src/main/java/validator/V= alidatorBean.java Log: Change UIBeanValidator to UIComponent Modified: branches/community/3.3.X/test-applications/jsp/src/main/java/vali= dator/ValidatorBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/jsp/src/main/java/validator/= ValidatorBean.java 2009-05-25 14:00:38 UTC (rev 14308) +++ branches/community/3.3.X/test-applications/jsp/src/main/java/validator/= ValidatorBean.java 2009-05-25 14:00:46 UTC (rev 14309) @@ -22,7 +22,6 @@ import org.hibernate.validator.Pattern; import org.hibernate.validator.Range; import org.hibernate.validator.Size; -import org.richfaces.component.UIBeanValidator; = import util.componentInfo.ComponentInfo; = @@ -45,7 +44,7 @@ @Size(min=3D1,max=3D5,message=3D"Size validation failed!") private ArrayList sizeValues; private String sizeValue; - private UIBeanValidator ajaxValidatorComponent =3D null; + private UIComponent ajaxValidatorComponent =3D null; private boolean ajaxSingle; private String bindLabel; private boolean disableDefault; @@ -228,11 +227,11 @@ return null; } = = - public UIBeanValidator getAjaxValidatorComponent() { + public UIComponent getAjaxValidatorComponent() { return ajaxValidatorComponent; } = - public void setAjaxValidatorComponent(UIBeanValidator ajaxValidatorCompon= ent) { + public void setAjaxValidatorComponent(UIComponent ajaxValidatorComponent)= { this.ajaxValidatorComponent =3D ajaxValidatorComponent; } = --===============8367637016790296214==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 10:41:43 2009 Content-Type: multipart/mixed; boundary="===============2744578569288105028==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14310 - in branches/community/3.3.X/docs: userguide and 1 other directories. Date: Mon, 25 May 2009 10:34:32 -0400 Message-ID: --===============2744578569288105028== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: artdaw Date: 2009-05-25 10:34:32 -0400 (Mon, 25 May 2009) New Revision: 14310 Modified: branches/community/3.3.X/docs/pom.xml branches/community/3.3.X/docs/userguide/en/pom.xml branches/community/3.3.X/docs/userguide/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7081 - masterTranslation parameter wa= s added Modified: branches/community/3.3.X/docs/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/pom.xml 2009-05-25 14:00:46 UTC (rev 1430= 9) +++ branches/community/3.3.X/docs/pom.xml 2009-05-25 14:34:32 UTC (rev 1431= 0) @@ -105,5 +105,6 @@ classpath:/common-resources/xslt/xhtml-single.xsl classpath:/common-resources/xslt/xhtml.xsl + en \ No newline at end of file Modified: branches/community/3.3.X/docs/userguide/en/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-25 14:00:46 = UTC (rev 14309) +++ branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-25 14:34:32 = UTC (rev 14310) @@ -9,7 +9,7 @@ ../pom.xml org.richfaces.docs.userguide - ${translation} + ${masterTranslation} 3.3.2-SNAPSHOT jar Richfaces Manual (${translation}) Modified: branches/community/3.3.X/docs/userguide/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/pom.xml 2009-05-25 14:00:46 UTC= (rev 14309) +++ branches/community/3.3.X/docs/userguide/pom.xml 2009-05-25 14:34:32 UTC= (rev 14310) @@ -620,7 +620,7 @@ org.richfaces.docs.common-resources - ${project.translation} + ${masterTranslation} ${project.version} @@ -976,10 +976,8 @@ --> - - en - = + en --===============2744578569288105028==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 11:22:58 2009 Content-Type: multipart/mixed; boundary="===============6472466680817632598==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14311 - branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces. Date: Mon, 25 May 2009 11:15:47 -0400 Message-ID: --===============6472466680817632598== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Alex.Kolonitsky Date: 2009-05-25 11:15:45 -0400 (Mon, 25 May 2009) New Revision: 14311 Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richf= aces/htmlMenuItem.jspx Log: ContextMenu: browser context menu is not blocked on menu itself https://jira.jboss.org/jira/browse/RF-7087 Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/or= g/richfaces/htmlMenuItem.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/menu-components/src/main/templates/org/rich= faces/htmlMenuItem.jspx 2009-05-25 14:34:32 UTC (rev 14310) +++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/rich= faces/htmlMenuItem.jspx 2009-05-25 15:15:45 UTC (rev 14311) @@ -42,7 +42,8 @@
      + onclick=3D"Event.stop(event);" + onContextMenu=3D"false;" > = @@ -78,7 +80,8 @@ = + style=3D"#{component.attributes['iconStyle']}" = + onContextMenu=3D"Event.stop(event); return false;"> = #{component.attributes['value']} --===============6472466680817632598==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 11:43:27 2009 Content-Type: multipart/mixed; boundary="===============4936865594311011113==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14312 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf6487 and 1 other directory. Date: Mon, 25 May 2009 11:36:16 -0400 Message-ID: --===============4936865594311011113== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 11:36:16 -0400 (Mon, 25 May 2009) New Revision: 14312 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf6487/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf6487/Test.java Log: RF-6487 test java bean. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf6487/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6487/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6487/Test.java 2009-05-25 15:3= 6:16 UTC (rev 14312) @@ -0,0 +1,33 @@ +package org.richfaces.testng.rf6487; + +import org.richfaces.SeleniumTestBase; + +public class Test extends SeleniumTestBase { + + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); = + = + selenium.assignId("form:text", "text"); = + selenium.mouseMove("text"); = + = + selenium.fireEvent("text", "mouseover"); = + = + AssertTextEquals("form:toolTipID", "//"); + = + clickAjaxCommandAndWait("form:buttonID"); + = + selenium.mouseMove("text"); = + selenium.fireEvent("text", "mouseover"); + = + AssertTextEquals("form:toolTipID", "-add//"); = + = + = + } + = + @Override + public String getTestUrl() { = + return "pages/rf6487.xhtml"; + } + +} \ No newline at end of file --===============4936865594311011113==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 11:44:14 2009 Content-Type: multipart/mixed; boundary="===============8306596943397223305==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14313 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues: rf6487 and 1 other directory. Date: Mon, 25 May 2009 11:37:03 -0400 Message-ID: --===============8306596943397223305== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 11:37:03 -0400 (Mon, 25 May 2009) New Revision: 14313 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf6487/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf6487/Bean.java Log: RF-6487 test page added. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6487/Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6487/Bean.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6487/Bean.java 20= 09-05-25 15:37:03 UTC (rev 14313) @@ -0,0 +1,29 @@ +package org.richfaces.regressionarea.issues.rf6487; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +(a)Name("rf6487") +(a)Scope(ScopeType.SESSION) +public class Bean { + + private String val; + + public Bean() { + val =3D ""; + } + + public void action() { + val +=3D "-add"; + } + + public String getVal() { + return val; + } + + public void setVal(String val) { + this.val =3D val; + } + +} --===============8306596943397223305==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 11:46:51 2009 Content-Type: multipart/mixed; boundary="===============1346617312193082300==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14314 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Mon, 25 May 2009 11:39:40 -0400 Message-ID: --===============1346617312193082300== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 11:39:40 -0400 (Mon, 25 May 2009) New Revision: 14314 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf6487.xhtml Log: RF-6487 test page. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf6487.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf6487.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf6487.xhtml 2009-05-25 15:39:40 UTC (rev 14314) @@ -0,0 +1,21 @@ + + + + + + + + + <= /rich:toolTip> + +
      + +       +       +       + --===============1346617312193082300==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 12:43:32 2009 Content-Type: multipart/mixed; boundary="===============7550281105859534751==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14315 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf6338 and 1 other directory. Date: Mon, 25 May 2009 12:36:20 -0400 Message-ID: --===============7550281105859534751== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 12:36:20 -0400 (Mon, 25 May 2009) New Revision: 14315 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf6338/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf6338/Test.java Log: Test java bean for RF-6338 added Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-tests/src/test/java/org/richfaces/testng/rf6338/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6338/Test.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6338/Test.java 2009-05-25 16:3= 6:20 UTC (rev 14315) @@ -0,0 +1,32 @@ +package org.richfaces.testng.rf6338; + +import org.richfaces.SeleniumTestBase; + +public class Test extends SeleniumTestBase { + + @org.testng.annotations.Test + public void testExecute() throws Exception { + renderPage(); + + selenium.assignId("iconform:group1", "group1"); + selenium.assignId("iconform:group2", "group2"); + clickById("group1"); + pause(500, null); + AssertVisible("iconform:item1_1"); + clickById("group2"); + pause(500, null); + AssertVisible("iconform:item1_2"); + clickById("group1"); + pause(500, null); + AssertNotVisible("iconform:item1_1"); + clickById("group2"); + pause(500, null); + AssertNotVisible("iconform:item1_2"); + } + + @Override + public String getTestUrl() { + return "pages/rf6338.xhtml"; + } + +} --===============7550281105859534751==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 12:44:08 2009 Content-Type: multipart/mixed; boundary="===============1051786844314501156==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14316 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues: rf6338 and 1 other directory. Date: Mon, 25 May 2009 12:36:56 -0400 Message-ID: --===============1051786844314501156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 12:36:55 -0400 (Mon, 25 May 2009) New Revision: 14316 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf6338/ branches/community/3.3.X/test-applications/regressionArea/regressionArea= -ejb/src/main/java/org/richfaces/regressionarea/issues/rf6338/Bean.java Log: java bean for RF-6338 added Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6338/Bean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6338/Bean.java = (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6338/Bean.java 20= 09-05-25 16:36:55 UTC (rev 14316) @@ -0,0 +1,16 @@ +package org.richfaces.regressionarea.issues.rf6338; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +(a)Name("rf6338") +(a)Scope(ScopeType.SESSION) +public class Bean { + + public Bean() { = + } + = + public void action() { = + } +} --===============1051786844314501156==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 12:44:41 2009 Content-Type: multipart/mixed; boundary="===============2086452624068692638==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14317 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages. Date: Mon, 25 May 2009 12:37:29 -0400 Message-ID: --===============2086452624068692638== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-25 12:37:29 -0400 (Mon, 25 May 2009) New Revision: 14317 Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -web/src/main/webapp/pages/rf6338.xhtml Log: Test page for RF-6338 added. Added: branches/community/3.3.X/test-applications/regressionArea/regression= Area-web/src/main/webapp/pages/rf6338.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf6338.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-web/src/main/webapp/pages/rf6338.xhtml 2009-05-25 16:37:29 UTC (rev 14317) @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + --===============2086452624068692638==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 12:55:05 2009 Content-Type: multipart/mixed; boundary="===============5147371075201479284==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14318 - branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/component. Date: Mon, 25 May 2009 12:47:53 -0400 Message-ID: --===============5147371075201479284== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2009-05-25 12:47:53 -0400 (Mon, 25 May 2009) New Revision: 14318 Modified: branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/com= ponent/UIOrderingList.java Log: https://jira.jboss.org/jira/browse/RF-7251 Modified: branches/community/3.3.X/ui/orderingList/src/main/java/org/richfa= ces/component/UIOrderingList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/co= mponent/UIOrderingList.java 2009-05-25 16:37:29 UTC (rev 14317) +++ branches/community/3.3.X/ui/orderingList/src/main/java/org/richfaces/co= mponent/UIOrderingList.java 2009-05-25 16:47:53 UTC (rev 14318) @@ -280,14 +280,6 @@ this.submittedValueHolder =3D (SubmittedValue) object; } = - protected Object saveIterationState() { - return valueHolder; - } - - protected void restoreIterationState(Object object) { - this.valueHolder =3D (ValueHolder) object; - } - public abstract void setImmediate(boolean immediate); = public abstract void setRequired(boolean required); @@ -444,7 +436,7 @@ ValueBinding vb =3D getValueBinding("value"); if (vb !=3D null) { vb.setValue(context, valueHolder.value); - setValue(null); + valueHolder.value =3D null; setLocalValueSet(false); } } @@ -557,6 +549,10 @@ throw new NullPointerException(); } = + if (submittedValueHolder =3D=3D null) { + return; + } + // http://jira.jboss.com/jira/browse/RF-3852 = = Object previousValue =3D getValue(); @@ -599,10 +595,6 @@ = validateValue(context, newValue); = - if (submittedValueHolder =3D=3D null) { - return; - } - // If our value is valid, store the new value, erase the // "submitted" value, and emit a ValueChangeEvent if appropriate if (isValid()) { @@ -686,7 +678,9 @@ } = public void setValue(Object value) { - if (value instanceof ValueHolder) { + if (value =3D=3D null) { + this.valueHolder =3D null; + } else if (value instanceof ValueHolder) { this.valueHolder =3D (ValueHolder) value; } else { createValueHolder(); --===============5147371075201479284==-- From richfaces-svn-commits at lists.jboss.org Mon May 25 13:13:18 2009 Content-Type: multipart/mixed; boundary="===============7101747946394093052==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14319 - in branches/community/3.3.X/ui/inputnumber-slider/src: main/resources/org/richfaces/renderkit/html/script and 2 other directories. Date: Mon, 25 May 2009 13:02:06 -0400 Message-ID: --===============7101747946394093052== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-25 13:02:06 -0400 (Mon, 25 May 2009) New Revision: 14319 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/ri= chfaces/renderkit/html/css/slider.xcss branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/ri= chfaces/renderkit/html/script/SliderScript.js branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/inputN= umberSlider.jspx branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfac= es/component/InputNumberSliderComponentTest.java Log: RF-7221 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources= /org/richfaces/renderkit/html/css/slider.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/r= ichfaces/renderkit/html/css/slider.xcss 2009-05-25 16:47:53 UTC (rev 14318) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/r= ichfaces/renderkit/html/css/slider.xcss 2009-05-25 17:02:06 UTC (rev 14319) @@ -4,41 +4,41 @@ xmlns=3D"http://www.w3.org/1999/xhtml" > = - + = - + = - + @@ -201,7 +201,7 @@ = - + @@ -209,94 +209,94 @@ = - + = - + = - + = - + = - + = - + - + - + - + = - + - + - + - + = - + = - + = - + = - + Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources= /org/richfaces/renderkit/html/script/SliderScript.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/r= ichfaces/renderkit/html/script/SliderScript.js 2009-05-25 16:47:53 UTC (rev= 14318) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/r= ichfaces/renderkit/html/script/SliderScript.js 2009-05-25 17:02:06 UTC (rev= 14319) @@ -24,15 +24,15 @@ this.orientation =3D this.options.orientation; = this.classes =3D {}; - this.classes.arrow =3D "dr-insldr-handler rich-inslider-handler"; - this.classes.arrowSelected =3D "dr-insldr-handler-sel rich-inslider-hand= ler-selected"; + this.classes.arrow =3D "rich-inslider-handler"; + this.classes.arrowSelected =3D "rich-inslider-handler-selected"; this.classes.temp =3D this.handle.className; - this.classes.base =3D " " + this.trim(this.classes.temp.replace("dr-insl= dr-handler rich-inslider-handler","")); + this.classes.base =3D " " + this.trim(this.classes.temp.replace("rich-in= slider-handler","")); = if(this.orientation=3D=3D"vertical"){ - this.classes.arrow =3D "dr-insldr-handler-vertical rich-inslider-hand= ler-vertical"; - this.classes.arrowSelected =3D "dr-insldr-handler-sel-vertical rich-i= nslider-handler-selected-vertical"; - this.classes.base =3D " " + this.trim(this.classes.temp.replace("dr-i= nsldr-handler-vertical rich-inslider-handler-vertical","")); + this.classes.arrow =3D "rich-inslider-handler-vertical"; + this.classes.arrowSelected =3D "rich-inslider-handler-selected-vertic= al"; + this.classes.base =3D " " + this.trim(this.classes.temp.replace("rich= -inslider-handler-vertical","")); } = this.classes.handleSelected =3D " " + handleSelectedClass; @@ -472,7 +472,7 @@ = increaseDown : function(event){ this.arrowButton =3D $(event.target); - this.arrowButton.className =3D this.arrowButton.className.replace(= "Class","SelectedClass").replace("al","al-sel"); + this.arrowButton.className =3D this.arrowButton.className.replace(= "Class","SelectedClass").replace("al","al-selected"); window.document.onmouseup =3D this.eventIncreaseUp.bindAsEventList= ener(this); if(!this.disabled){ if (this.options.currValue){ @@ -485,7 +485,7 @@ = decreaseDown : function(event){ this.arrowButton =3D $(event.target); - this.arrowButton.className =3D this.arrowButton.className.replace(= "Class","SelectedClass").replace("al","al-sel"); + this.arrowButton.className =3D this.arrowButton.className.replace(= "Class","SelectedClass").replace("al","al-selected"); window.document.onmouseup =3D this.eventDecreaseUp.bindAsEventList= ener(this); if(!this.disabled){ if (this.options.currValue){ @@ -501,7 +501,7 @@ if (this.options.currValue){ Element.hide(this.tipArrowInc); } - this.arrowButton.className =3D this.arrowButton.className.replace(= "SelectedClass","Class").replace("al-sel","al"); + this.arrowButton.className =3D this.arrowButton.className.replace(= "SelectedClass","Class").replace("al-selected","al"); window.document.onmouseup =3D this.prevMouseUp; }, = @@ -510,7 +510,7 @@ if (this.options.currValue){ Element.hide(this.tipArrowDec); } - this.arrowButton.className =3D this.arrowButton.className.replace(= "SelectedClass","Class").replace("al-sel","al"); + this.arrowButton.className =3D this.arrowButton.className.replace(= "SelectedClass","Class").replace("al-selected","al"); window.document.onmouseup =3D this.prevMouseUp; }, = Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/templates= /inputNumberSlider.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/input= NumberSlider.jspx 2009-05-25 16:47:53 UTC (rev 14318) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/input= NumberSlider.jspx 2009-05-25 17:02:06 UTC (rev 14319) @@ -56,7 +56,7 @@ ]]>       = -
      @@ -71,7 +71,7 @@ name=3D"#{clientId}" value=3D"#{this:getInputValue(cont= ext,component)}" type=3D"text" - class=3D"dr-insldr-field dr-insldr= -field-top rich-inslider-field #{component.attributes['inputClass']}" + class=3D"rich-inslider-field-top r= ich-inslider-field #{component.attributes['inputClass']}" style=3D"#{component.attributes['i= nputStyle']}; #{color}" readonly=3D"#{inputReadOnly}" disabled=3D"#{inputDisabled}" @@ -113,15 +113,15 @@ if (((Boolean)variables.getVariable("showArrows")).booleanVa= lue()) { ]]> -
      +
      -
      +
      =
      @@ -135,13 +135,13 @@ - - -
      = -
      = +
      - +
      - @@ -149,12 +149,12 @@
      +
      -
      +
      -
      +
      @@ -164,7 +164,7 @@ -
      		+ #{component.attributes['maxValue']} + #{component.attributes['minValue']}
      +
      -
      +
      @@ -228,7 +228,7 @@ name=3D"#{clientId}" value=3D"#{this:getInputValue(cont= ext,component)}" type=3D"text" - class=3D"dr-insldr-field dr-insldr= -field-bottom rich-inslider-field #{component.attributes['inputClass']}" + class=3D"rich-inslider-field-botto= m rich-inslider-field #{component.attributes['inputClass']}" style=3D"#{component.attributes['i= nputStyle']}; #{color}" readonly=3D"#{inputReadOnly}" disabled=3D"#{inputDisabled}" @@ -310,7 +310,7 @@ ]]> = - @@ -325,7 +325,7 @@ name=3D"#{clientId}" value=3D"#{this:getInputValue(cont= ext,component)}" type=3D"text" - class=3D"dr-insldr-field dr-insldr= -field-left rich-inslider-field #{component.attributes['inputClass']}" + class=3D"rich-inslider-field-left = rich-inslider-field #{component.attributes['inputClass']}" style=3D"#{component.attributes['i= nputStyle']}; #{color}" readonly=3D"#{inputReadOnly}" disabled=3D"#{inputDisabled}" @@ -366,15 +366,15 @@ - - -
      +
      -
      +
      =
      @@ -383,7 +383,7 @@ } ]]> = -
      		+ @@ -392,7 +392,7 @@ } ]]> + @@ -405,15 +405,15 @@ - +
      -
      +
      = @@ -433,7 +433,7 @@ name=3D"#{clientId}" value=3D"#{this:getInputValue(context,component)}" type=3D"text" - class=3D"dr-insldr-field dr-insldr-field-right rich-inslider-fie= ld #{component.attributes['inputClass']}" + class=3D"rich-inslider-field-right rich-inslider-field #{compone= nt.attributes['inputClass']}" style=3D"#{component.attributes['inputStyle']}; #{color}" readonly=3D"#{inputReadOnly}" disabled=3D"#{inputDisabled}" @@ -472,28 +472,28 @@ ]]>
      - +
      +
      -
      +
      -
      +
      -
      - +
      +
      - Modified: branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/= richfaces/component/InputNumberSliderComponentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfa= ces/component/InputNumberSliderComponentTest.java 2009-05-25 16:47:53 UTC (= rev 14318) +++ branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfa= ces/component/InputNumberSliderComponentTest.java 2009-05-25 17:02:06 UTC (= rev 14319) @@ -134,7 +134,7 @@ assertNotNull(htmlSlider); = assertTrue(htmlSlider.getAttributeValue("class").contains( - "dr-insldr rich-slider")); + "rich-inslider rich-slider")); = HtmlInput htmlSliderInput =3D (HtmlInput) renderedView.getHtmlElem= entById( slider.getClientId(facesContext) + "Input"); @@ -143,31 +143,31 @@ = String a =3D htmlSliderInput.getClassAttribute(); assertTrue(htmlSliderInput.getClassAttribute().contains( - "dr-insldr-field dr-insldr-field-right rich-inslider-field= ")); + "rich-inslider-field-right rich-inslider-field")); assertTrue(htmlSliderInput.getTypeAttribute().equals("text")); = DomNode numContainer =3D htmlSliderInput.getParentNode() .getPreviousSibling(); assertTrue(((HtmlElement) numContainer).getAttributeValue( "class").contains( - "dr-insldr-right-num rich-inslider-right-num")); + "rich-inslider-right-num")); assertTrue(((HtmlElement) (numContainer.getPreviousSibling())) .getAttributeValue("class").contains( - "dr-insldr-left-num rich-inslider-left-num")); + "rich-inslider-left-num")); = HtmlElement tip =3D renderedView.getHtmlElementById(slider.getClie= ntId( facesContext) + "Tip"); assertTrue(tip.getAttributeValue("class").contains( - "dr-insldr-tip rich-inslider-tip")); + "rich-inslider-tip")); = HtmlElement handle =3D renderedView.getHtmlElementById(slider.getC= lientId( facesContext) + "Handle"); assertTrue(handle.getAttributeValue("class").contains( - "dr-insldr-handler rich-inslider-handler")); + "rich-inslider-handler")); = HtmlElement track =3D (HtmlElement) tip.getParentNode().getNextSib= ling(); assertTrue(track.getAttributeValue("class").contains( - "dr-insldr-track rich-inslider-track")); + "rich-inslider-track")); } = public void testHiddenInput() throws Exception { @@ -367,7 +367,7 @@ assertNotNull(htmlSlider); = assertTrue(htmlSlider.getAttributeValue("class").contains( - "dr-insldr-vertical rich-slider ")); + "rich-inslider-vertical rich-slider ")); = HtmlInput htmlSliderInput =3D (HtmlInput) renderedView .getHtmlElementById(slider.getClientId(facesContext) + "Input"); @@ -375,7 +375,7 @@ assertNotNull(htmlSliderInput); = assertTrue(htmlSliderInput.getClassAttribute().contains( - "dr-insldr-field dr-insldr-field-top rich-inslider-field ")); + "rich-inslider-field-top rich-inslider-field ")); assertTrue(htmlSliderInput.getTypeAttribute().equals("text")); = HtmlDivision track =3D (HtmlDivision) ((HtmlElement) renderedView @@ -383,26 +383,26 @@ .getFirstDomChild(); = assertTrue(track.getAttributeValue("class").contains( - "dr-insldr-track-vertical rich-inslider-track")); + "rich-inslider-track-vertical rich-inslider-track")); = DomNode numContainer =3D track.getParentDomNode().getParentDomNode() .getNextDomSibling().getFirstDomChild(); assertTrue(((HtmlElement) numContainer).getAttributeValue("class") - .contains("dr-insldr-bottom-num ")); + .contains("rich-inslider-bottom-num ")); assertTrue(((HtmlElement) track.getParentDomNode().getNextDomSibling()) - .getAttributeValue("class").contains("dr-insldr-top-num ")); + .getAttributeValue("class").contains("rich-inslider-top-num ")); = HtmlElement tip =3D renderedView.getHtmlElementById(slider .getClientId(facesContext) + "Tip"); assertTrue(tip.getAttributeValue("class").contains( - "dr-insldr-tip rich-inslider-tip")); + "rich-inslider-tip")); = HtmlElement handle =3D renderedView.getHtmlElementById(slider .getClientId(facesContext) + "Handle"); assertTrue(handle.getAttributeValue("class").contains( - "dr-insldr-handler-vertical ")); + "rich-inslider-handler-vertical ")); } = public void testShowArrows() throws Exception { @@ -412,19 +412,19 @@ .getHtmlElementById(slider.getClientId(facesContext) + "ArrowInc"); assertTrue(htmlSliderArrowInc.getClassAttribute().equals( - "dr-insldr-inc-horizontal dr-insldr-arrow ")); + "rich-inslider-inc-horizontal rich-inslider-arrow ")); = HtmlDivision htmlSliderArrowDec =3D (HtmlDivision) renderedView .getHtmlElementById(slider.getClientId(facesContext) + "ArrowDec"); assertTrue(htmlSliderArrowDec.getClassAttribute().equals( - "dr-insldr-dec-horizontal dr-insldr-arrow ")); + "rich-inslider-dec-horizontal rich-inslider-arrow ")); = HtmlDivision htmlSliderTipArrowInc =3D (HtmlDivision) renderedView .getHtmlElementById(slider.getClientId(facesContext) + "TipArrowInc"); assertTrue(htmlSliderTipArrowInc.getClassAttribute().equals( - "dr-insldr-tip rich-inslider-tip ")); + "rich-inslider-tip ")); assertTrue(htmlSliderTipArrowInc.getStyleAttribute().equals( "display: none; ")); = @@ -432,7 +432,7 @@ .getHtmlElementById(slider.getClientId(facesContext) + "TipArrowDec"); assertTrue(htmlSliderTipArrowDec.getClassAttribute().equals( - "dr-insldr-tip rich-inslider-tip ")); + "rich-inslider-tip ")); assertTrue(htmlSliderTipArrowDec.getStyleAttribute().equals( "display: none; ")); } --===============7101747946394093052==-- From richfaces-svn-commits at lists.jboss.org Tue May 26 05:19:19 2009 Content-Type: multipart/mixed; boundary="===============1590813413516488189==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14320 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6338. Date: Tue, 26 May 2009 05:11:58 -0400 Message-ID: --===============1590813413516488189== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mvitenkov Date: 2009-05-26 05:11:58 -0400 (Tue, 26 May 2009) New Revision: 14320 Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea= -tests/src/test/java/org/richfaces/testng/rf6338/Test.java Log: correction. Modified: branches/community/3.3.X/test-applications/regressionArea/regress= ionArea-tests/src/test/java/org/richfaces/testng/rf6338/Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6338/Test.java 2009-05-25 17:0= 2:06 UTC (rev 14319) +++ branches/community/3.3.X/test-applications/regressionArea/regressionAre= a-tests/src/test/java/org/richfaces/testng/rf6338/Test.java 2009-05-26 09:1= 1:58 UTC (rev 14320) @@ -7,20 +7,17 @@ @org.testng.annotations.Test public void testExecute() throws Exception { renderPage(); - - selenium.assignId("iconform:group1", "group1"); - selenium.assignId("iconform:group2", "group2"); - clickById("group1"); - pause(500, null); + = + clickById("iconform:group1"); = AssertVisible("iconform:item1_1"); - clickById("group2"); - pause(500, null); + = + clickById("iconform:group2"); = AssertVisible("iconform:item1_2"); - clickById("group1"); - pause(500, null); + = + clickById("iconform:group1"); = AssertNotVisible("iconform:item1_1"); - clickById("group2"); - pause(500, null); + = + clickById("iconform:group2"); = AssertNotVisible("iconform:item1_2"); } = --===============1590813413516488189==-- From richfaces-svn-commits at lists.jboss.org Tue May 26 06:21:08 2009 Content-Type: multipart/mixed; boundary="===============4552519553612331604==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14321 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt. Date: Tue, 26 May 2009 06:13:47 -0400 Message-ID: --===============4552519553612331604== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-26 06:13:47 -0400 (Tue, 26 May 2009) New Revision: 14321 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl Log: https://jira.jboss.org/jira/browse/RF-7081 - reverting the last modificatio= ns; Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f= .xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2= 009-05-26 09:11:58 UTC (rev 14320) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2= 009-05-26 10:13:47 UTC (rev 14321) @@ -3,21 +3,20 @@ xmlns:javaee=3D"http://java.sun.com/xml/ns/javaee" xmlns:u=3D"http:/jsf.exadel.com/template/util" xmlns:f=3D'http:/jsf.exadel.com/template' - version=3D"1.0" exclude-result-prefixes=3D"javaee u f"> - + - = = - + = = @@ -54,46 +53,29 @@ = = - + - - + + = - = - - - - - - - - - - - = - - - - - - = - =
      - = + + + + + + + + + + - - + < @@ -116,7 +97,7 @@ = - + @@ -127,8 +108,7 @@ = - - = + =
      + 3D""
      <xsl:value-of select=3D"$prefix" /> @@ -189,9 +169,8 @@ </tgroup> </table> </xsl:if--> - <xsl:choose> - <xsl:when test=3D"$prefixExistence"> + <xsl:when test=3D"document(concat($lang, $separator, 'included', $sepa= rator, $prefix, '_', $tag_name, '.xml'))"> <xsl:for-each select=3D"document(concat($lang, $separator,'included',= $separator, $prefix, '_', $tag_name, '.xml'))/*"> <xsl:copy-of select=3D"./*" /> </xsl:for-each> @@ -203,7 +182,7 @@ </xsl:otherwise> </xsl:choose> = + </section> -</xsl:result-document> = </xsl:template> -</xsl:transform> +</xsl:transform> \ No newline at end of file --===============4552519553612331604==-- From richfaces-svn-commits at lists.jboss.org Tue May 26 06:22:18 2009 Content-Type: multipart/mixed; boundary="===============4179564362081064975==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14322 - branches/community/3.3.X/docs/userguide/en/src/main/docbook. Date: Tue, 26 May 2009 06:14:56 -0400 Message-ID: <E1M8tgO-0003qs-MS@committer01.frg.pub.inap.atl.jboss.com> --===============4179564362081064975== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-26 06:14:56 -0400 (Tue, 26 May 2009) New Revision: 14322 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml Log: https://jira.jboss.org/jira/browse/RF-7081 - reverting the last modificatio= ns; Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/maste= r.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-26 10:13:47 UTC (rev 14321) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/master.xml = 2009-05-26 10:14:56 UTC (rev 14322) @@ -7,125 +7,60 @@ <!ENTITY rfcSettings SYSTEM "modules/RFCSettings.xml"> <!ENTITY wadParams SYSTEM "modules/AUGWADParams.xml"> <!ENTITY rfcarchitectover SYSTEM "modules/RFCarchitectover.xml"> - = + <!--ENTITY rfclibrary SYSTEM "modules/RFClibrary.xml"--> <!ENTITY rfcidesupport SYSTEM "modules/RFCidesupport.xml"> <!ENTITY rfclinks SYSTEM "modules/RFClinks.xml"> + <!--ENTITY richfaces_table SYSTEM "../../../target/generated/rich.xml"--> + <!ENTITY extendedDataTable_table SYSTEM "../../../target/generated/extend= edDataTable.xml"> + <!ENTITY dataFilterSlider_table SYSTEM "../../../target/generated/dataFil= terSlider.xml"> + <!ENTITY dataScroller_table SYSTEM "../../../target/generated/datascrolle= r.xml"> + <!ENTITY dataTable_table SYSTEM "../../../target/generated/dataTable.xml"> + <!ENTITY dnd_table SYSTEM "../../../target/generated/dnd.xml"> + <!ENTITY effect_table SYSTEM "../../../target/generated/effect.xml"> + <!ENTITY gmap_table SYSTEM "../../../target/generated/gmap.xml"> + <!ENTITY virtualEarth_table SYSTEM "../../../target/generated/virtualEart= h.xml"> + <!ENTITY inputNumberSlider_table SYSTEM "../../../target/generated/inputn= umber-slider.xml"> + <!ENTITY inputNumberSpinner_table SYSTEM "../../../target/generated/input= number-spinner.xml"> + <!ENTITY modalPanel_table SYSTEM "../../../target/generated/modal-panel.x= ml"> + <!ENTITY paint2D_table SYSTEM "../../../target/generated/paint2D.xml"> + <!ENTITY panel_table SYSTEM "../../../target/generated/panel.xml"> + <!ENTITY panelBar_table SYSTEM "../../../target/generated/panelbar.xml"> + <!ENTITY separator_table SYSTEM "../../../target/generated/separator.xml"> + <!ENTITY simpleTogglePanel_table SYSTEM "../../../target/generated/simple= TogglePanel.xml"> + <!ENTITY spacer_table SYSTEM "../../../target/generated/spacer.xml"> + <!ENTITY suggestionbox_table SYSTEM "../../../target/generated/suggestion= box.xml"> + <!ENTITY tabPanel_table SYSTEM "../../../target/generated/tabPanel.xml"> + <!ENTITY togglePanel_table SYSTEM "../../../target/generated/togglePanel.= xml"> + <!ENTITY toolBar_table SYSTEM "../../../target/generated/toolBar.xml"> + <!ENTITY tree_table SYSTEM "../../../target/generated/tree.xml"> + <!ENTITY dropDownMenu_table SYSTEM "../../../target/generated/dropdown-me= nu.xml"> + <!ENTITY menuComponents_table SYSTEM "../../../target/generated/menu-comp= onents.xml"> + <!ENTITY panelMenu_table SYSTEM "../../../target/generated/panelmenu.xml"> + <!ENTITY message_table SYSTEM "../../../target/generated/message.xml"> + <!ENTITY calendar_table SYSTEM "../../../target/generated/calendar.xml"> + <!ENTITY tooltip_table SYSTEM "../../../target/generated/tooltip.xml"> + <!ENTITY insert_table SYSTEM "../../../target/generated/insert.xml"> + <!ENTITY treeModel_table SYSTEM "../../../target/generated/tree-model.xml= "> + <!ENTITY scrollableDataTable_table SYSTEM "../../../target/generated/scro= llableDataTable.xml"> + <!ENTITY jQuery_table SYSTEM "../../../target/generated/jQuery.xml"> + <!ENTITY contextMenu_table SYSTEM "../../../target/generated/contextMenu.= xml"> + <!ENTITY listShuttle_table SYSTEM "../../../target/generated/listShuttle.= xml"> + <!ENTITY orderingList_table SYSTEM "../../../target/generated/orderingLis= t.xml"> + <!ENTITY componentControl_table SYSTEM "../../../target/generated/compone= ntControl.xml"> + <!ENTITY columns_table SYSTEM "../../../target/generated/columns.xml"> + <!ENTITY comboBox_table SYSTEM "../../../target/generated/combobox.xml"> + <!ENTITY pickList_table SYSTEM "../../../target/generated/pickList.xml"> + <!ENTITY progressBar_table SYSTEM "../../../target/generated/progressBar.= xml"> + <!ENTITY inplaceInput_table SYSTEM "../../../target/generated/inplaceInpu= t.xml"> + <!ENTITY inplaceSelect_table SYSTEM "../../../target/generated/inplaceSel= ect.xml"> + <!ENTITY fileUpload_table SYSTEM "../../../target/generated/fileUpload.xm= l"> + <!ENTITY hotKey_table SYSTEM "../../../target/generated/hotKey.xml"> + <!ENTITY coreComponents_table SYSTEM "../../../target/generated/a4j.xml"> + <!ENTITY beanValidator_table SYSTEM "../../../target/generated/beanValida= tor.xml"> + <!ENTITY editor_table SYSTEM "../../../target/generated/editor.xml"> + <!ENTITY colorPicker_table SYSTEM "../../../target/generated/colorPicker.= xml"> + <!ENTITY layout_table SYSTEM "../../../target/generated/layout.xml"> = - <!ENTITY a4j_actionparam SYSTEM "../../../target/generated/a4j_actionpara= m.xml"> - <!ENTITY a4j_form SYSTEM "../../../target/generated/a4j_form.xml"> - <!ENTITY a4j_region SYSTEM "../../../target/generated/a4j_region.xml"> - <!ENTITY a4j_support SYSTEM "../../../target/generated/a4j_support.xml"> - <!ENTITY a4j_commandButton SYSTEM "../../../target/generated/a4j_commandB= utton.xml"> - <!ENTITY a4j_commandLink SYSTEM "../../../target/generated/a4j_commandLin= k.xml"> - <!ENTITY a4j_jsFunction SYSTEM "../../../target/generated/a4j_jsFunction.= xml"> - <!ENTITY a4j_poll SYSTEM "../../../target/generated/a4j_poll.xml"> - <!ENTITY a4j_push SYSTEM "../../../target/generated/a4j_push.xml"> - <!ENTITY a4j_queue SYSTEM "../../../target/generated/a4j_queue.xml"> - <!ENTITY a4j_status SYSTEM "../../../target/generated/a4j_status.xml"> - <!ENTITY a4j_ajaxListener SYSTEM "../../../target/generated/a4j_ajaxListe= ner.xml"> - - <!ENTITY a4j_loadBundle SYSTEM "../../../target/generated/a4j_loadBundle.= xml"> - <!ENTITY a4j_loadScript SYSTEM "../../../target/generated/a4j_loadScript.= xml"> - <!ENTITY a4j_loadStyle SYSTEM "../../../target/generated/a4j_loadStyle.xm= l"> - <!ENTITY a4j_keepAlive SYSTEM "../../../target/generated/a4j_keepAlive.xm= l"> - - <!ENTITY rich_ajaxValidator SYSTEM "../../../target/generated/rich_ajaxVa= lidator.xml"> - <!ENTITY rich_beanValidator SYSTEM "../../../target/generated/rich_beanVa= lidator.xml"> - <!ENTITY rich_graphValidator SYSTEM "../../../target/generated/rich_graph= Validator.xml"> - - <!ENTITY a4j_mediaOutput SYSTEM "../../../target/generated/a4j_mediaOutpu= t.xml"> - <!ENTITY a4j_include SYSTEM "../../../target/generated/a4j_include.xml"> - <!ENTITY a4j_outputPanel SYSTEM "../../../target/generated/a4j_outputPane= l.xml"> - = - <!ENTITY a4j_page SYSTEM "../../../target/generated/a4j_page.xml"> - <!ENTITY a4j_portlet SYSTEM "../../../target/generated/a4j_portlet.xml"> - <!ENTITY a4j_htmlCommandLink SYSTEM "../../../target/generated/a4j_htmlCo= mmandLink.xml"> - <!ENTITY a4j_log SYSTEM "../../../target/generated/a4j_log.xml"> - - <!ENTITY rich_column SYSTEM "../../../target/generated/rich_column.xml"> = - <!ENTITY rich_columnGroup SYSTEM "../../../target/generated/rich_columnGr= oup.xml"> - <!ENTITY rich_columns SYSTEM "../../../target/generated/rich_columns.xml"> - <!ENTITY rich_dataDefinitionList SYSTEM "../../../target/generated/rich_d= ataDefinitionList.xml"> - <!ENTITY rich_dataFilterSlider SYSTEM "../../../target/generated/rich_dat= aFilterSlider.xml"> - <!ENTITY rich_dataGrid SYSTEM "../../../target/generated/rich_dataGrid.xm= l"> - <!ENTITY rich_dataList SYSTEM "../../../target/generated/rich_dataList.xm= l"> - <!ENTITY rich_dataOrderedList SYSTEM "../../../target/generated/rich_data= OrderedList.xml"> - <!ENTITY rich_datascroller SYSTEM "../../../target/generated/rich_datascr= oller.xml"> - <!ENTITY rich_dataTable SYSTEM "../../../target/generated/rich_dataTable.= xml"> - <!ENTITY rich_subTable SYSTEM "../../../target/generated/rich_subTable.xm= l"> - <!ENTITY rich_extendedDataTable SYSTEM "../../../target/generated/rich_ex= tendedDataTable.xml"> - <!ENTITY a4j_repeat SYSTEM "../../../target/generated/a4j_repeat.xml"> - <!ENTITY rich_scrollableDataTable SYSTEM "../../../target/generated/rich_= scrollableDataTable.xml"> - - <!ENTITY rich_dragIndicator SYSTEM "../../../target/generated/rich_dragIn= dicator.xml"> - <!ENTITY rich_dragSupport SYSTEM "../../../target/generated/rich_dragSupp= ort.xml"> - <!ENTITY rich_dndParam SYSTEM "../../../target/generated/rich_dndParam.xm= l"> - <!ENTITY rich_dropSupport SYSTEM "../../../target/generated/rich_dropSupp= ort.xml"> - <!ENTITY rich_dropListener SYSTEM "../../../target/generated/rich_dropLis= tener.xml"> - <!ENTITY rich_dragListener SYSTEM "../../../target/generated/rich_dragLis= tener.xml"> - - <!ENTITY rich_contextMenu SYSTEM "../../../target/generated/rich_contextM= enu.xml"> - <!ENTITY rich_dropDownMenu SYSTEM "../../../target/generated/rich_dropDow= nMenu.xml"> - <!ENTITY rich_menuGroup SYSTEM "../../../target/generated/rich_menuGroup.= xml"> - <!ENTITY rich_menuItem SYSTEM "../../../target/generated/rich_menuItem.xm= l"> - <!ENTITY rich_menuSeparator SYSTEM "../../../target/generated/rich_menuSe= parator.xml"> - - <!ENTITY rich_recursiveTreeNodesAdaptor SYSTEM "../../../target/generated= /rich_recursiveTreeNodesAdaptor.xml"> - <!ENTITY rich_tree SYSTEM "../../../target/generated/rich_tree.xml"> - <!ENTITY rich_treeNode SYSTEM "../../../target/generated/rich_treeNode.xm= l"> - <!ENTITY rich_treeNodesAdaptor SYSTEM "../../../target/generated/rich_tre= eNodesAdaptor.xml"> - <!ENTITY rich_changeExpandListener SYSTEM "../../../target/generated/rich= _changeExpandListener.xml"> - <!ENTITY rich_nodeSelectListener SYSTEM "../../../target/generated/rich_n= odeSelectListener.xml"> - = - <!ENTITY rich_modalPanel SYSTEM "../../../target/generated/rich_modalPane= l.xml"> - <!ENTITY rich_paint2D SYSTEM "../../../target/generated/rich_paint2D.xml"> - <!ENTITY rich_panel SYSTEM "../../../target/generated/rich_panel.xml"> - <!ENTITY rich_panelBar SYSTEM "../../../target/generated/rich_panelBar.xm= l"> - <!ENTITY rich_panelBarItem SYSTEM "../../../target/generated/rich_panelBa= rItem.xml"> - <!ENTITY rich_panelMenu SYSTEM "../../../target/generated/rich_panelMenu.= xml"> - <!ENTITY rich_panelMenuItem SYSTEM "../../../target/generated/rich_panelM= enuItem.xml"> - <!ENTITY rich_panelMenuGroup SYSTEM "../../../target/generated/rich_panel= MenuGroup.xml"> - <!ENTITY rich_progressBar SYSTEM "../../../target/generated/rich_progress= Bar.xml"> - <!ENTITY rich_separator SYSTEM "../../../target/generated/rich_separator.= xml"> - <!ENTITY rich_simpleTogglePanel SYSTEM "../../../target/generated/rich_si= mpleTogglePanel.xml"> - <!ENTITY rich_spacer SYSTEM "../../../target/generated/rich_spacer.xml"> = - <!ENTITY rich_tabPanel SYSTEM "../../../target/generated/rich_tabPanel.xm= l"> = - <!ENTITY rich_tab SYSTEM "../../../target/generated/rich_tab.xml"> = - <!ENTITY rich_togglePanel SYSTEM "../../../target/generated/rich_togglePa= nel.xml"> = - <!ENTITY rich_toggleControl SYSTEM "../../../target/generated/rich_toggle= Control.xml"> = - <!ENTITY rich_toolBar SYSTEM "../../../target/generated/rich_toolBar.xml"= > = - <!ENTITY rich_toolBarGroup SYSTEM "../../../target/generated/rich_toolBar= Group.xml"> = - <!ENTITY rich_toolTip SYSTEM "../../../target/generated/rich_toolTip.xml"= > = - - <!ENTITY rich_calendar SYSTEM "../../../target/generated/rich_calendar.xm= l"> - <!ENTITY rich_colorPicker SYSTEM "../../../target/generated/rich_colorPic= ker.xml"> - <!ENTITY rich_comboBox SYSTEM "../../../target/generated/rich_comboBox.xm= l"> - <!ENTITY rich_editor SYSTEM "../../../target/generated/rich_editor.xml"> - <!ENTITY rich_fileUpload SYSTEM "../../../target/generated/rich_fileUploa= d.xml"> - <!ENTITY rich_inplaceInput SYSTEM "../../../target/generated/rich_inplace= Input.xml"> - <!ENTITY rich_inplaceSelect SYSTEM "../../../target/generated/rich_inplac= eSelect.xml"> - <!ENTITY rich_inputNumberSlider SYSTEM "../../../target/generated/rich_in= putNumberSlider.xml"> - <!ENTITY rich_inputNumberSpinner SYSTEM "../../../target/generated/rich_i= nputNumberSpinner.xml"> - <!ENTITY rich_suggestionbox SYSTEM "../../../target/generated/rich_sugges= tionbox.xml"> - - <!ENTITY rich_listShuttle SYSTEM "../../../target/generated/rich_listShut= tle.xml"> - <!ENTITY rich_orderingList SYSTEM "../../../target/generated/rich_orderin= gList.xml"> - <!ENTITY rich_pickList SYSTEM "../../../target/generated/rich_pickList.xm= l"> - = - <!ENTITY rich_page SYSTEM "../../../target/generated/rich_page.xml"> - <!ENTITY rich_layout SYSTEM "../../../target/generated/rich_layout.xml"> - <!ENTITY rich_layoutPanel SYSTEM "../../../target/generated/rich_layoutPa= nel.xml"> - = - = - <!ENTITY rich_componentControl SYSTEM "../../../target/generated/rich_com= ponentControl.xml"> - <!ENTITY rich_effect SYSTEM "../../../target/generated/rich_effect.xml"> - <!ENTITY rich_gmap SYSTEM "../../../target/generated/rich_gmap.xml"> - <!ENTITY rich_virtualEarth SYSTEM "../../../target/generated/rich_virtual= Earth.xml"> - <!ENTITY rich_hotKey SYSTEM "../../../target/generated/rich_hotKey.xml"> - <!ENTITY rich_insert SYSTEM "../../../target/generated/rich_insert.xml"> - <!ENTITY rich_message SYSTEM "../../../target/generated/rich_message.xml"> - <!ENTITY rich_messages SYSTEM "../../../target/generated/rich_messages.xm= l"> - <!ENTITY rich_jQuery SYSTEM "../../../target/generated/rich_jQuery.xml"> = ]> <book> <bookinfo> @@ -166,184 +101,69 @@ &rfcarchitectover; = <chapter role=3D"NotInToc" id=3D"RichFacesComponentsLibrary" xreflabel=3D"= RichFacesComponentsLibrary"> - <?dbhtml filename=3D"RichFacesComponentsLibrary.html"?> - <title>The RichFaces Components - - The library encompasses ready-made components built based on = - the Rich Faces CDK. - - -
      - - Ajax Support - - &a4j_ajaxListener; - &a4j_actionparam; - &a4j_form; - &a4j_region; - &a4j_support; - &a4j_commandButton; - &a4j_commandLink; - &a4j_jsFunction; - &a4j_poll; - &a4j_push; - &a4j_queue; - &a4j_status; -
      -
      - - Resources/Beans Handling - - &a4j_loadBundle; - &a4j_keepAlive; - &a4j_loadScript; - &a4j_loadStyle; -
      -
      - - Ajax Validators - - &rich_ajaxValidator; - &rich_beanValidator; - &rich_graphValidator; -
      -
      - - Ajax Output - - &a4j_include; - &a4j_mediaOutput; - &a4j_outputPanel; -
      -
      - - Ajax Miscellaneous - - &a4j_page; - &a4j_portlet; - &a4j_htmlCommandLink; - &a4j_log; -
      -
      - - Data Iteration - - &rich_column; - &rich_columnGroup; - &rich_columns; - &rich_dataDefinitionList; - &rich_dataFilterSlider; - &rich_dataGrid; - &rich_dataList; - &rich_dataOrderedList; - &rich_datascroller; - &rich_dataTable; - &rich_subTable; - &rich_extendedDataTable; - &a4j_repeat; - &rich_scrollableDataTable; -
      -
      - - Drag-Drop Support - - &rich_dragIndicator; - &rich_dragSupport; - &rich_dragListener; - &rich_dropListener; - &rich_dropSupport; - &rich_dndParam; -
      -
      - - Rich Menu - - &rich_contextMenu; - &rich_dropDownMenu; - &rich_menuGroup; - &rich_menuItem; - &rich_menuSeparator; -
      -
      - - Rich Trees - - &rich_tree; - &rich_treeNode; - &rich_treeNodesAdaptor; - &rich_recursiveTreeNodesAdaptor; - &rich_changeExpandListener; - &rich_nodeSelectListener; -
      -
      - - Rich Output - - &rich_modalPanel; - &rich_paint2D; - &rich_panel; - &rich_panelBar; - &rich_panelBarItem; - &rich_panelMenu; - &rich_panelMenuGroup; - &rich_panelMenuItem; - &rich_progressBar; - &rich_separator; - &rich_simpleTogglePanel; - &rich_spacer; - &rich_tabPanel; - &rich_tab; - &rich_togglePanel; - &rich_toggleControl; - &rich_toolBar; - &rich_toolBarGroup; - &rich_toolTip; -
      -
      - - Rich Input - - &rich_calendar; - &rich_colorPicker; - &rich_comboBox; - &rich_editor; - &rich_fileUpload; - &rich_inplaceInput; - &rich_inplaceSelect; - &rich_inputNumberSlider; - &rich_inputNumberSpinner; - &rich_suggestionbox; -
      -
      - - Rich Selects - - &rich_listShuttle; - &rich_orderingList; - &rich_pickList; -
      -
      - - Rich Semantic Layouts - - &rich_page; - &rich_layout; - &rich_layoutPanel; -
      -
      - - Rich Miscellaneous - - &rich_componentControl; - &rich_effect; - &rich_gmap; - &rich_virtualEarth; - &rich_hotKey; - &rich_insert; - &rich_message; - &rich_messages; - &rich_jQuery; -
      = + + = + The RichFaces Components + The library encompasses ready-made components built based on the <= emphasis> + Rich Faces CDK + + . + + + = +&coreComponents_table; +&beanValidator_table; +&calendar_table; +&colorPicker_table; +&comboBox_table; +&componentControl_table; +&contextMenu_table; +&dataFilterSlider_table; +&dataScroller_table; +&columns_table; +&dataTable_table; +&editor_table; +&dnd_table; +&dropDownMenu_table; +&extendedDataTable_table; +&menuComponents_table; +&effect_table; +&fileUpload_table; +&gmap_table; +&graphValidator_table; +&virtualEarth_table; +&hotKey_table; +&inplaceInput_table; +&inplaceSelect_table; +&inputNumberSlider_table; +&inputNumberSpinner_table; +&insert_table; +&jQuery_table; +&layout_table; +&listShuttle_table; +&message_table; +&modalPanel_table; +&orderingList_table; +&paint2D_table; +&panel_table; +&panelBar_table; +&panelMenu_table; +&pickList_table; +&progressBar_table; +&scrollableDataTable_table; +&separator_table; +&simpleTogglePanel_table; +&spacer_table; +&suggestionbox_table; +&tabPanel_table; +&togglePanel_table; +&toolBar_table; +&tooltip_table; +&tree_table; +&treeModel_table; + = &rfcidesupport; --===============4179564362081064975==-- From richfaces-svn-commits at lists.jboss.org Tue May 26 07:44:38 2009 Content-Type: multipart/mixed; boundary="===============6834441292719673171==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14323 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included. Date: Tue, 26 May 2009 07:37:16 -0400 Message-ID: --===============6834441292719673171== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-05-26 07:37:16 -0400 (Tue, 26 May 2009) New Revision: 14323 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ric= h_page.xml Log: https://jira.jboss.org/jira/browse/RF-7231 - adding the note to the 'Detail= s of usage' section; Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/inclu= ded/rich_page.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ri= ch_page.xml 2009-05-26 10:14:56 UTC (rev 14322) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ri= ch_page.xml 2009-05-26 11:37:16 UTC (rev 14323) @@ -111,6 +111,12 @@ ...]]> = = + + Note: + Note, the <rich:pag= e> component encodes the full page structure. Ther= efore, be sure you don't = + use the doctype declaration, root html element, head and b= ody elements on the same page where you've put this component. + + = The implementation of the = <rich:page> component provides four facets that= you can use to arrange the layout of the page: "header", "s= ubheader", "sidebar" and "footer". Their behavio= r is quite self-explanatory. The position of the panel rendered by the "sidebar"= ; facet can be set with the "sidebarPosition"= attribute that can take either "right" or = "left" as values, you can also specify the width for this facet w= ith the "sidebarWidth"= attribute. --===============6834441292719673171==-- From richfaces-svn-commits at lists.jboss.org Tue May 26 07:58:06 2009 Content-Type: multipart/mixed; boundary="===============2713138424128134985==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r14324 - in branches/community/3.3.X/ui/inputnumber-spinner/src: main/templates and 1 other directories. Date: Tue, 26 May 2009 07:50:39 -0400 Message-ID: --===============2713138424128134985== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: konstantin.mishin Date: 2009-05-26 07:50:39 -0400 (Tue, 26 May 2009) New Revision: 14324 Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/r= ichfaces/renderkit/html/css/spinner.xcss branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/input= NumberSpinner.jspx branches/community/3.3.X/ui/inputnumber-spinner/src/test/java/org/richfa= ces/component/InputNumberSpinnerComponentTest.java Log: RF-7221 Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/resource= s/org/richfaces/renderkit/html/css/spinner.xcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/= richfaces/renderkit/html/css/spinner.xcss 2009-05-26 11:37:16 UTC (rev 1432= 3) +++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/resources/org/= richfaces/renderkit/html/css/spinner.xcss 2009-05-26 11:50:39 UTC (rev 1432= 4) @@ -5,7 +5,7 @@ = = - + @@ -55,12 +55,12 @@ = - + = - + Modified: branches/community/3.3.X/ui/inputnumber-spinner/src/main/template= s/inputNumberSpinner.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inpu= tNumberSpinner.jspx 2009-05-26 11:37:16 UTC (rev 14323) +++ branches/community/3.3.X/ui/inputnumber-spinner/src/main/templates/inpu= tNumberSpinner.jspx 2009-05-26 11:50:39 UTC (rev 14324) @@ -20,7 +20,7 @@ new org.ajax4jsf.javascript.PrototypeScript(),script/SpinnerSc= ript.js,/org/richfaces/renderkit/html/scripts/browser_info.js css/spinner.xcss = -
      - = -
      + +