Andrew, can you apply it to the 1.2.10.1 branch of the plugins as well ?
-Matthias On Fri, Jul 10, 2009 at 8:06 PM, MARIA KAVAL<[email protected]> wrote: > Ok,great, thanks Andrew for trying it out. If it had been a real bug, I would > have been glad to catch it earlier rather than later! > Jeanne, can you go ahead and commit the patch? > Maria > > -----Original Message----- > From: Andrew Robinson (JIRA) [mailto:[email protected]] > Sent: Friday, July 10, 2009 10:59 AM > To: MARIA KAVAL > Subject: [jira] Commented: (TRINIDAD-1529) Enhanced support for tag doc > generation to support screenshots and better formatting of example code > snippets > > > [ > https://issues.apache.org/jira/browse/TRINIDAD-1529?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12729741#action_12729741 > ] > > Andrew Robinson commented on TRINIDAD-1529: > ------------------------------------------- > > My bad, the reason it isn't working is that the patch isn't applying to the > trunk: > > anrob...@anrobins-pc:~/development/maven-trinidad/trunk$ svn info > Path: . > URL: https://svn.apache.org/repos/asf/myfaces/trinidad-maven/trunk > Repository Root: https://svn.apache.org/repos/asf Repository UUID: > 13f79535-47bb-0310-9956-ffa450edef68 > Revision: 793056 > Node Kind: directory > Schedule: normal > Last Changed Author: matzew > Last Changed Rev: 782175 > Last Changed Date: 2009-06-05 18:45:28 -0600 (Fri, 05 Jun 2009) > anrob...@anrobins-pc:~/development/maven-trinidad/trunk$ svn up At revision > 793056. > anrob...@anrobins-pc:~/development/maven-trinidad/trunk$ curl > https://issues.apache.org/jira/secure/attachment/12413063/plugins2.patch | > patch -p0 > % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 100 12559 100 12559 0 0 7180 0 0:00:01 0:00:01 --:--:-- 9690 > (Stripping trailing CRs from patch.) > patching file > maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java > Hunk #1 FAILED at 33. > Hunk #2 FAILED at 52. > Hunk #3 FAILED at 228. > Hunk #4 FAILED at 345. > 4 out of 4 hunks FAILED -- saving rejects to file > maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java.rej > (Stripping trailing CRs from patch.) > patching file > maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java > (Stripping trailing CRs from patch.) > patching file > maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ScreenshotBean.java > (Stripping trailing CRs from patch.) > patching file > maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl > (Stripping trailing CRs from patch.) > patching file > maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java > > >> Enhanced support for tag doc generation to support screenshots and >> better formatting of example code snippets >> ---------------------------------------------------------------------- >> --------------------------------------- >> >> Key: TRINIDAD-1529 >> URL: https://issues.apache.org/jira/browse/TRINIDAD-1529 >> Project: MyFaces Trinidad >> Issue Type: Improvement >> Components: Plugins >> Reporter: Maria Kaval >> Attachments: plugins.patch, plugins2.patch >> >> >> This JIRA is to support having a tag to mark screenshots within the tag doc >> xml. This will ensure that all pages have the same formatting for >> screenshots (e.g. the header text will be the same, one can easily skin the >> section, and the screenshots will appear at the same section of the tag doc, >> etc). >> >> I suggest modifying the plugin to understand: >> <mfp:screenshot> >> <mfp:image> HERE YOU PLACE YOUR IMG TAG</mfp:image> >> <mfp:description> HERE YOU PLACE THE CAPTION THAT GOES WITH YOUR >> IMG TAG </mfp:description> </mfp:screenshot> >> >> A real-world example would look like: >> <mfp:screenshot> >> <mfp:image> >> <![CDATA[ >> <img src="../images/inputDate.png" alt="inputDate screenshot"></img> >> ]]> >> </mfp:image> >> <mfp:description> >> inputDate component as shown when rendered in a simple form >> </mfp:description> >> </mfp:screenshot> >> This JIRA also covers modifying the plugin for how it generates the >> mfp:example tag. Currently mfp:example outputs bold text at the end of the >> description with "Example:". The issue is that depending on what text is >> towards the end of the long description, sometimes it appears the Example is >> for something very specific to that page instead of generic to the >> component. I've therefore modifed the plugin to create a new section when >> mfp:example tag is encountered. > > -- > This message is automatically generated by JIRA. > - > You can reply to this email to add a comment to the issue online. > > -- Matthias Wessendorf blog: http://matthiaswessendorf.wordpress.com/ sessions: http://www.slideshare.net/mwessendorf twitter: http://twitter.com/mwessendorf
