Ferdinand Soethe wrote: > > I would like to apply these two updates to 0.7 to fix bugs and make > 0.7 usable in a project and a have some questions on procedure: > > - What is the procedure on doing that? > Lazy consensus, just do it?
Any changes that have been made to trunk can be also applied to the maintenance branch. Just do whatever. I already synchronised some. > - How do I best apply these? My best guess is: > co /forrest/branches/forrest_07_branch/ > apply changes describes below > ci changes > > I'm sure creating and applying a patch file would be smarter but > I'm not sure on the exact steps to so that. I just copy the files in question from the trunk to the branch, then diff, commit. > - QA > Is anybody checking this branch for line ending probems etc before > it is made available for download as a package? > If not what is a foolproof test to check if my line endings are > correct? No. But it can be done. It is not being released, so no download package. People can easily package it themselves, see the package instruction in etc/RELESE_PROCESS.txt (only need the packaging step). In the past, we have not done releases of a branch unless it has been specifically requested. The 0.5.1 was due to a cocoon issue. So if there are important issues then we can do a release. There have been a couple of important fixes already. How to check the line endings. There is a script in the ASF comitters repository at the tools directory. Also see the Cocoon page: http://cocoon.apache.org/community/committer.html If that doesn't work for you then i will check it. -David > Thanks for your help, > Ferdinand > > > > Author: ferdinand > > Date: Sat Jul 30 03:45:40 2005 > > New Revision: 226492 > > > URL: http://svn.apache.org/viewcvs?rev=226492&view=rev > > Log: > > Fixed problem of IMG with id-attributes disappearing. > > > Modified: > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > > Modified: > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > URL: > > http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=226492&r1=226491&r2=226492&view=diff > > ============================================================================== > > --- > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > (original) > > +++ > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Sat Jul > > 30 03:45:40 2005 > > @@ -368,8 +368,13 @@ > > <!-- End of "toc" mode templates --> > > > > <xsl:template match="node()|@*" priority="-1"> > > + <!-- id processing will create its own a-element so processing has to > > + happen outside the copied element > + -->> > > + <xsl:apply-templates select="@id"/> > > <xsl:copy> > > - <xsl:apply-templates select="@*"/> > > + <xsl:apply-templates select="@*[name(.) != 'id']"/> > > + <xsl:copy-of select="@id"/> > > <xsl:apply-templates/> > > </xsl:copy> > > </xsl:template> > > > > > > Author: ferdinand > > Date: Mon Jul 25 10:59:13 2005 > > New Revision: 225159 > > > URL: http://svn.apache.org/viewcvs?rev=225159&view=rev > > Log: > > Fixed/added pass-through for id-attribute in several elements > > > Modified: > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl > > > Modified: > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > URL: > > http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=225159&r1=225158&r2=225159&view=diff > > ============================================================================== > > --- > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl > > (original) > > +++ > > forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Mon Jul > > 25 10:59:13 2005 > > @@ -192,6 +192,7 @@ > > <xsl:template match="[EMAIL PROTECTED]:space='preserve']"> > > <xsl:apply-templates select="@id"/> > > <div class="pre"> > > + <xsl:copy-of select="@id"/> > > <xsl:apply-templates/> > > </div> > > </xsl:template> > > @@ -200,6 +201,7 @@ > > <xsl:apply-templates select="@id"/> > > <pre class="code"> > > <!-- Temporarily removed long-line-splitter ... gives out-of-memory > > problems --> > > + <xsl:copy-of select="@id"/> > > <xsl:apply-templates/> > > <!-- > > <xsl:call-template name="format"> > > @@ -211,26 +213,33 @@ > > </xsl:template> > > > > <xsl:template match="anchor"> > > - <a name="[EMAIL PROTECTED]"/> > > + <a name="[EMAIL PROTECTED]"> > > + <xsl:copy-of select="@id"/> > > + </a> > > </xsl:template> > > > > <xsl:template match="icon"> > > <xsl:apply-templates select="@id"/> > > <img class="icon"> > > - <xsl:copy-of select="@height | @width | @src | @alt"/> > > + <xsl:copy-of select="@height | @width | @src | @alt | @id"/> > > </img> > > </xsl:template> > > > > <xsl:template match="code"> > > <xsl:apply-templates select="@id"/> > > - <span class="codefrag"><xsl:value-of select="."/></span> > > + <span class="codefrag"> > > + <xsl:copy-of select="@id"/> > > + <xsl:value-of select="."/> > > + </span> > > </xsl:template> > > > > <xsl:template match="figure"> > > <xsl:apply-templates select="@id"/> > > + > > <div align="center"> > > + <xsl:copy-of select="@id"/> > > <img class="figure"> > > - <xsl:copy-of select="@height | @width | @src | @alt"/> > > + <xsl:copy-of select="@height | @width | @src | @alt | @id"/> > > </img> > > </div> > > </xsl:template> > > @@ -238,7 +247,7 @@ > > <xsl:template match="table"> > > <xsl:apply-templates select="@id"/> > > <table cellpadding="4" cellspacing="1" class="ForrestTable"> > > - <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class > > | @bgcolor"/> > > + <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class > > | @bgcolor |@id"/> > > <xsl:apply-templates/> > > </table> > > </xsl:template> > > > Modified: > > forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl > > URL: > > http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl?rev=225159&r1=225158&r2=225159&view=diff > > ============================================================================== > > --- > > forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl (original) > > +++ > > forrest/trunk/main/webapp/skins/pelt/xslt/html/document2html.xsl Mon Jul 25 > > 10:59:13 2005 > > @@ -136,8 +136,8 @@ > > > > <xsl:template match="figure"> > > <xsl:apply-templates select="@id"/> > > - <div style="text-align: center;"> > > - <img src="[EMAIL PROTECTED]" alt="[EMAIL PROTECTED]" class="figure"> > > + <div style="text-align: center;" id="[EMAIL PROTECTED]"> > > + <img src="[EMAIL PROTECTED]" alt="[EMAIL PROTECTED]" class="figure" > > id="[EMAIL PROTECTED]"> > > <xsl:if test="@height"> > > <xsl:attribute name="height"><xsl:value-of > > select="@height"/></xsl:attribute> > > </xsl:if> > >
