You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@myfaces.apache.org by Mike Kienenberger <mk...@gmail.com> on 2005/11/29 23:58:38 UTC
Re: svn commit: r349809 - /myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
Simon,
I had to merge in the myfaces_sandbox.tld file changes I made, and it
looks like it may have missed some of your whitespace changes. Sorry
about that, but it's very difficult under Windows to detect whitespace
changes, since SVN whitespace differs from the checked-out whitespace
due to all of the EOL differences.
If it's not easy for you to reapply the change, let me know, and I'll
try to figure out a fix tomorrow.
On 11/29/05, skitching@apache.org <sk...@apache.org> wrote:
> Author: skitching
> Date: Tue Nov 29 13:05:18 2005
> New Revision: 349809
>
> URL: http://svn.apache.org/viewcvs?rev=349809&view=rev
> Log:
> Convert tabs to spaces only
>
> Modified:
> myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
>
> Modified: myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
> URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/tld/myfaces_sandbox.tld?rev=349809&r1=349808&r2=349809&view=diff
> ==============================================================================
> --- myfaces/sandbox/trunk/tld/myfaces_sandbox.tld (original)
> +++ myfaces/sandbox/trunk/tld/myfaces_sandbox.tld Tue Nov 29 13:05:18 2005
> @@ -143,7 +143,7 @@
> <body-content>empty</body-content>
> <display-name>Planner component</display-name>
> <description>
> - A meeting planner component, similar to the ones found in Outlook or Evolution.
> + A meeting planner component, similar to the ones found in Outlook or Evolution.
> </description>
> &ui_component_attributes;
> &ui_schedule_attributes;
> @@ -151,15 +151,15 @@
> </tag>
>
>
> - <!-- schedule -->
> - <tag>
> + <!-- schedule -->
> + <tag>
> <name>schedule</name>
> <tag-class>org.apache.myfaces.custom.schedule.ScheduleTag</tag-class>
> <body-content>empty</body-content>
> <display-name>Schedule component</display-name>
> <description>
> - A schedule component similar to the ones found in Outlook or Evolution
> - </description>
> + A schedule component similar to the ones found in Outlook or Evolution
> + </description>
> &ui_component_attributes;
> &ui_command_attributes;
> &ui_schedule_attributes;
> @@ -173,7 +173,7 @@
> <body-content>JSP</body-content>
> <description>
> Provides an input textbox with "suggest" functionality, using a remote connection to the server.
> - The difference to inputSuggest is that a custom drop down is rendered.
> + The difference to inputSuggest is that a custom drop down is rendered.
> </description>
> &standard_input_text_attributes;
> &ext_forceId_attribute;
> @@ -183,10 +183,10 @@
> &user_role_attributes;
>
> <attribute>
> - <name>size</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - <type>java.lang.String</type>
> + <name>size</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + <type>java.lang.String</type>
> </attribute>
>
> <attribute>
> @@ -321,9 +321,10 @@
> <tag-class>org.apache.myfaces.custom.urlvalidator.ValidateUrlTag</tag-class>
> <body-content>JSP</body-content>
> <description>
> - A custom validator for url format, based upons Jakarta Commons.
> + A custom validator for url format, based upons Jakarta Commons.
> </description>
> </tag>
> +
> <!-- Validator for isbn codes -->
> <tag>
> <name>validateISBN</name>
> @@ -333,6 +334,7 @@
> A custom validator for isbn codes, based upons Jakarta Commons.
> </description>
> </tag>
> +
> <!-- autoUpdateDataTable -->
> <tag>
> <name>autoUpdateDataTable</name>
> @@ -487,13 +489,13 @@
> </tag>
>
> <!-- Converter for Boolean values -->
> - <tag>
> - <name>convertBoolean</name>
> - <tag-class>org.apache.myfaces.custom.convertboolean.ConvertBooleanTag</tag-class>
> - <display-name>Boolean Converter</display-name>
> - <description>
> - Converts a boolean to custom format (yes/no), (1/0), etc.
> - </description>
> + <tag>
> + <name>convertBoolean</name>
> + <tag-class>org.apache.myfaces.custom.convertboolean.ConvertBooleanTag</tag-class>
> + <display-name>Boolean Converter</display-name>
> + <description>
> + Converts a boolean to custom format (yes/no), (1/0), etc.
> + </description>
>
> <attribute>
> <name>trueValue</name>
> @@ -506,15 +508,15 @@
> <required>false</required>
> <description>Value representing a boolean false, e.g. FALSE, no, 0, etc.</description>
> </attribute>
> - </tag>
> + </tag>
>
> <tag>
> - <name>convertDateTime</name>
> - <tag-class>org.apache.myfaces.custom.convertDateTime.ConvertDateTimeTag</tag-class>
> - <display-name>DateTime Converter</display-name>
> - <description>
> - Convert date time using normal system timezone like it should
> - </description>
> + <name>convertDateTime</name>
> + <tag-class>org.apache.myfaces.custom.convertDateTime.ConvertDateTimeTag</tag-class>
> + <display-name>DateTime Converter</display-name>
> + <description>
> + Convert date time using normal system timezone like it should
> + </description>
>
> <attribute>
> <name>dateStyle</name>
> @@ -552,42 +554,42 @@
> <rtexprvalue>false</rtexprvalue>
> <description>date|time|both</description>
> </attribute>
> - </tag>
> + </tag>
>
> <!-- fieldset -->
> - <tag>
> - <name>fieldset</name>
> - <tag-class>org.apache.myfaces.custom.fieldset.FieldsetTag</tag-class>
> - <body-content>JSP</body-content>
> - <description>Renders an HTML Fieldset</description>
> - &ui_component_attributes;
> + <tag>
> + <name>fieldset</name>
> + <tag-class>org.apache.myfaces.custom.fieldset.FieldsetTag</tag-class>
> + <body-content>JSP</body-content>
> + <description>Renders an HTML Fieldset</description>
> + &ui_component_attributes;
> &ext_forceId_attribute;
> &user_role_attributes;
> - <attribute>
> - <name>style</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - <description>
> - The style to use for this div.
> - </description>
> - </attribute>
> - <attribute>
> - <name>styleClass</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - <description>
> - The class to use for this div.
> - </description>
> - </attribute>
> - <attribute>
> - <name>legend</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - <description>
> - The fieldset's legend.
> - </description>
> - </attribute>
> - </tag>
> + <attribute>
> + <name>style</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + <description>
> + The style to use for this div.
> + </description>
> + </attribute>
> + <attribute>
> + <name>styleClass</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + <description>
> + The class to use for this div.
> + </description>
> + </attribute>
> + <attribute>
> + <name>legend</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + <description>
> + The fieldset's legend.
> + </description>
> + </attribute>
> + </tag>
>
> <!-- graphicImage -->
> <tag>
> @@ -611,10 +613,10 @@
> <rtexprvalue>false</rtexprvalue>
> <type>java.lang.String</type>
> <description>
> - Optional URL fragment to initialize the backing bean.
> - If you use this, the JSF tree won't be serialized in the URL, and so the URL will be MUCH smaller.
> - This could solve some 414 errors with some containers and/or clients.
> - </description>
> + Optional URL fragment to initialize the backing bean.
> + If you use this, the JSF tree won't be serialized in the URL, and so the URL will be MUCH smaller.
> + This could solve some 414 errors with some containers and/or clients.
> + </description>
> </attribute>
>
> <attribute>
> @@ -634,100 +636,101 @@
> </attribute>
>
> </tag>
> -<!-- effect -->
> - <tag>
> - <name>effect</name>
> - <tag-class>
> - org.apache.myfaces.custom.effect.EffectTag
> - </tag-class>
> - <body-content>JSP</body-content>
> - <description>provides javascript effects
> - which are from the script.aculo.us library
> - and from the fat fade anything technique library
> - </description>
> -
> - <attribute>
> - <name>id</name>
> - <required>true</required>
> - <rtexprvalue>false</rtexprvalue>
> - </attribute>
> -
> - <attribute>
> - <name>rendered</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.Boolean</type>
> - </attribute>
> -
> - <attribute>
> - <name>style</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - </attribute>
> - <attribute>
> - <name>styleClass</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - </attribute>
> - <attribute>
> - <name>rendered</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - </attribute>
> - <attribute>
> - <name>fade</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.Boolean</type>
> - </attribute>
> - <attribute>
> - <name>squish</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.Boolean</type>
> - </attribute>
> - <attribute>
> - <name>puff</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.Boolean</type>
> - </attribute>
> - <attribute>
> - <name>scale</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.String</type>
> - </attribute>
> -
> - <attribute>
> - <name>scaleSize</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - <type>java.lang.Integer</type>
> - </attribute>
> -
> - <attribute>
> - <name>pulsate</name>
> - <required>false</required>
> - <rtexprvalue>true</rtexprvalue>
> - </attribute>
> -
> - <attribute>
> - <name>fadeColor</name>
> - <required>false</required>
> - <rtexprvalue>false</rtexprvalue>
> - </attribute>
> - </tag>
> -
> - <!-- selectManyPicklist -->
> - <tag>
> +
> + <!-- effect -->
> + <tag>
> + <name>effect</name>
> + <tag-class>
> + org.apache.myfaces.custom.effect.EffectTag
> + </tag-class>
> + <body-content>JSP</body-content>
> + <description>provides javascript effects
> + which are from the script.aculo.us library
> + and from the fat fade anything technique library
> + </description>
> +
> + <attribute>
> + <name>id</name>
> + <required>true</required>
> + <rtexprvalue>false</rtexprvalue>
> + </attribute>
> +
> + <attribute>
> + <name>rendered</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.Boolean</type>
> + </attribute>
> +
> + <attribute>
> + <name>style</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + </attribute>
> + <attribute>
> + <name>styleClass</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + </attribute>
> + <attribute>
> + <name>rendered</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + </attribute>
> + <attribute>
> + <name>fade</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.Boolean</type>
> + </attribute>
> + <attribute>
> + <name>squish</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.Boolean</type>
> + </attribute>
> + <attribute>
> + <name>puff</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.Boolean</type>
> + </attribute>
> + <attribute>
> + <name>scale</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.String</type>
> + </attribute>
> +
> + <attribute>
> + <name>scaleSize</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + <type>java.lang.Integer</type>
> + </attribute>
> +
> + <attribute>
> + <name>pulsate</name>
> + <required>false</required>
> + <rtexprvalue>true</rtexprvalue>
> + </attribute>
> +
> + <attribute>
> + <name>fadeColor</name>
> + <required>false</required>
> + <rtexprvalue>false</rtexprvalue>
> + </attribute>
> + </tag>
> +
> + <!-- selectManyPicklist -->
> + <tag>
> <name>selectManyPicklist</name>
> <tag-class>org.apache.myfaces.custom.picklist.HtmlSelectManyPicklistTag</tag-class>
> <body-content>JSP</body-content>
> <display-name>selecManyPicklist component</display-name>
> <description>
> - A picklist component that allows to select items from one list to another
> - </description>
> + A picklist component that allows to select items from one list to another
> + </description>
> &standard_select_many_listbox_attributes;
> &user_role_attributes;
> </tag>
> @@ -824,7 +827,7 @@
> <description>Image to show instead of checkox when boolean value is false</description>
> </attribute>
> </tag>
> - <tag>
> + <tag>
> <name>selectBooleanCheckboxAjax</name>
> <tag-class>org.apache.myfaces.custom.inputAjax.HtmlSelectBooleanCheckboxAjaxTag</tag-class>
> <body-content>JSP</body-content>
>
>
>
Re: svn commit: r349809 - /myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
Posted by Simon Kitching <sk...@obsidium.com>.
Mike Kienenberger wrote:
> I think the problem is that compares against SVN aren't taking EOL
> into account. The file in Eclipse on my windows box has windows
> line-endings, and the file being compared against in the repository
> has unix (native) line-endings.
>
> Whatever the reason, diffs in Eclipse on Windows show every line as
> different until "ignore whitespace" is chosen.
Well, I don't know if this qualifies as good news or bad news, but that
is not normal behaviour; there's something wrong with your setup.
Perhaps you're using the "synchronize with repository" option in eclipse
and explicitly accepting the changes rather than selecting the "update"
option? The svn:eol-style property was fixed by me on Nov 25. I wouldn't
be surprised if "synchronize" doesn't correctly handle svn property
changes; it's given workmates repeated problems of various sorts.
Regards,
Simon
Re: svn commit: r349809 - /myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
Posted by Mike Kienenberger <mk...@gmail.com>.
I think the problem is that compares against SVN aren't taking EOL
into account. The file in Eclipse on my windows box has windows
line-endings, and the file being compared against in the repository
has unix (native) line-endings.
Whatever the reason, diffs in Eclipse on Windows show every line as
different until "ignore whitespace" is chosen.
On 11/29/05, Simon Kitching <sk...@obsidium.com> wrote:
> Mike Kienenberger wrote:
> > Simon,
> >
> > I had to merge in the myfaces_sandbox.tld file changes I made, and it
> > looks like it may have missed some of your whitespace changes. Sorry
> > about that, but it's very difficult under Windows to detect whitespace
> > changes, since SVN whitespace differs from the checked-out whitespace
> > due to all of the EOL differences.
> >
> > If it's not easy for you to reapply the change, let me know, and I'll
> > try to figure out a fix tomorrow.
>
> Thanks for letting me know. It's pretty much a search-and-replace so
> I've just reapplied the changes.
>
> However SVN handles whitespace cross-platform issues nicely in my
> experience. I can understand problems updating when someone has changed
> the svn:eol-style property on the file, but I don't know why you're
> experiencing problems with "normal" whitespace changes. I hope you can
> figure it out...
>
> Cheers,
>
> Simon
>
>
Re: svn commit: r349809 - /myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
Posted by Simon Kitching <sk...@obsidium.com>.
Mike Kienenberger wrote:
> Simon,
>
> I had to merge in the myfaces_sandbox.tld file changes I made, and it
> looks like it may have missed some of your whitespace changes. Sorry
> about that, but it's very difficult under Windows to detect whitespace
> changes, since SVN whitespace differs from the checked-out whitespace
> due to all of the EOL differences.
>
> If it's not easy for you to reapply the change, let me know, and I'll
> try to figure out a fix tomorrow.
Thanks for letting me know. It's pretty much a search-and-replace so
I've just reapplied the changes.
However SVN handles whitespace cross-platform issues nicely in my
experience. I can understand problems updating when someone has changed
the svn:eol-style property on the file, but I don't know why you're
experiencing problems with "normal" whitespace changes. I hope you can
figure it out...
Cheers,
Simon